diff options
| author | Luis R. Rodriguez | 2009-09-03 02:02:18 +0200 |
|---|---|---|
| committer | John W. Linville | 2009-09-08 22:31:04 +0200 |
| commit | 580171f7cd08687cdf1b263aabb35608b3c37433 (patch) | |
| tree | f11b817d537e100df257256cb6937d9b73640d33 /drivers/net/wireless/ath/ath9k/ahb.c | |
| parent | ath9k: propagate ieee80211_alloc_hw() failure (diff) | |
| download | kernel-qcow2-linux-580171f7cd08687cdf1b263aabb35608b3c37433.tar.gz kernel-qcow2-linux-580171f7cd08687cdf1b263aabb35608b3c37433.tar.xz kernel-qcow2-linux-580171f7cd08687cdf1b263aabb35608b3c37433.zip | |
ath9k: propagate errors on ath_init_device() and request_irq()
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>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/ahb.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/ahb.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ahb.c b/drivers/net/wireless/ath/ath9k/ahb.c index 5618fc25d52f..7dc6301ae201 100644 --- a/drivers/net/wireless/ath/ath9k/ahb.c +++ b/drivers/net/wireless/ath/ath9k/ahb.c @@ -120,16 +120,14 @@ static int ath_ahb_probe(struct platform_device *pdev) sc->irq = irq; ret = ath_init_device(AR5416_AR9100_DEVID, sc); - if (ret != 0) { - dev_err(&pdev->dev, "failed to attach device, err=%d\n", ret); - ret = -ENODEV; + if (ret) { + dev_err(&pdev->dev, "failed to initialize device\n"); goto err_free_hw; } ret = request_irq(irq, ath_isr, IRQF_SHARED, "ath9k", sc); if (ret) { - dev_err(&pdev->dev, "request_irq failed, err=%d\n", ret); - ret = -EIO; + dev_err(&pdev->dev, "request_irq failed\n"); goto err_detach; } |