Merge branch 'preempt' into release

[cascardo/linux.git] / drivers / net / wireless / ath / ath9k / ahb.c

diff --git a/drivers/net/wireless/ath/ath9k/ahb.c b/drivers/net/wireless/ath/ath9k/ahb.c
index 0e65c51..2ad7d02 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/ahb.c
+++ b/drivers/net/wireless/ath/ath9k/ahb.c
@@ -119,17 +119,15 @@ static int ath_ahb_probe(struct platform_device *pdev)
        sc->bus_ops = &ath_ahb_bus_ops;
        sc->irq = irq;
 
-       ret = ath_attach(AR5416_AR9100_DEVID, sc);
-       if (ret != 0) {
-               dev_err(&pdev->dev, "failed to attach device, err=%d\n", ret);
-               ret = -ENODEV;
+       ret = ath_init_device(AR5416_AR9100_DEVID, sc, 0x0);
+       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;
        }