lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ath9k: propagate errors on ath_init_device() and request_irq()

Browse Source 
We've cleaned up ath_init_device() and its children enough
to pass meaninful errors back from probe. When this fails
it means our device could not be initialized and a meaninful
error will have been passed.

Do the same for request_irq() and also synchronize the error
messages while at it.

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Luis R. Rodriguez
2009-09-02 17:02:18 -07:00
committed by John W. Linville
parent db6be53cba
commit 580171f7cd
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/wireless/ath/ath9k/ahb.c
View File

@@ -120,16 +120,14 @@ static int ath_ahb_probe(struct platform_device *pdev)
sc->irq = irq; sc->irq = irq;
ret = ath_init_device(AR5416_AR9100_DEVID, sc); ret = ath_init_device(AR5416_AR9100_DEVID, sc);
if (ret != 0) { if (ret) {
dev_err(&pdev->dev, "failed to attach device, err=%d\n", ret); dev_err(&pdev->dev, "failed to initialize device\n");
ret = -ENODEV;
goto err_free_hw; goto err_free_hw;
} }
ret = request_irq(irq, ath_isr, IRQF_SHARED, "ath9k", sc); ret = request_irq(irq, ath_isr, IRQF_SHARED, "ath9k", sc);
if (ret) { if (ret) {
dev_err(&pdev->dev, "request_irq failed, err=%d\n", ret); dev_err(&pdev->dev, "request_irq failed\n");
ret = -EIO;
goto err_detach; goto err_detach;
} }

12
drivers/net/wireless/ath/ath9k/pci.c
View File

@@ -179,17 +179,17 @@ static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
sc->mem = mem; sc->mem = mem;
sc->bus_ops = &ath_pci_bus_ops; sc->bus_ops = &ath_pci_bus_ops;
if (ath_init_device(id->device, sc) != 0) { ret = ath_init_device(id->device, sc);
ret = -ENODEV; if (ret) {
dev_err(&pdev->dev, "failed to initialize device\n");
goto bad3; goto bad3;
} }
/* setup interrupt service routine */ /* setup interrupt service routine */
if (request_irq(pdev->irq, ath_isr, IRQF_SHARED, "ath", sc)) { ret = request_irq(pdev->irq, ath_isr, IRQF_SHARED, "ath", sc);
printk(KERN_ERR "%s: request_irq failed\n", if (ret) {
wiphy_name(hw->wiphy)); dev_err(&pdev->dev, "request_irq failed\n");
ret = -EIO;
goto bad4; goto bad4;
} }