1 files changed, 15 insertions, 8 deletions

diff --git a/drivers/net/wireless/ath/ath9k/ahb.c b/drivers/net/wireless/ath/ath9k/ahb.c
index 329e6bc137a..9e62a569e81 100644
--- a/drivers/net/wireless/ath/ath9k/ahb.c
+++ b/drivers/net/wireless/ath/ath9k/ahb.c
@@ -121,16 +121,19 @@ static int ath_ahb_probe(struct platform_device *pdev)
         sc->mem = mem;
         sc->irq = irq;
 
-        ret = ath_init_device(AR5416_AR9100_DEVID, sc, 0x0, &ath_ahb_bus_ops);
+        /* Will be cleared in ath9k_start() */
+        sc->sc_flags |= SC_OP_INVALID;
+
+        ret = request_irq(irq, ath_isr, IRQF_SHARED, "ath9k", sc);
         if (ret) {
-                dev_err(&pdev->dev, "failed to initialize device\n");
+                dev_err(&pdev->dev, "request_irq failed\n");
                 goto err_free_hw;
         }
 
-        ret = request_irq(irq, ath_isr, IRQF_SHARED, "ath9k", sc);
+        ret = ath9k_init_device(AR5416_AR9100_DEVID, sc, 0x0, &ath_ahb_bus_ops);
         if (ret) {
-                dev_err(&pdev->dev, "request_irq failed\n");
-                goto err_detach;
+                dev_err(&pdev->dev, "failed to initialize device\n");
+                goto err_irq;
         }
 
         ah = sc->sc_ah;
@@ -143,8 +146,8 @@ static int ath_ahb_probe(struct platform_device *pdev)
 
         return 0;
 
- err_detach:
-        ath_detach(sc);
+ err_irq:
+        free_irq(irq, sc);
  err_free_hw:
         ieee80211_free_hw(hw);
         platform_set_drvdata(pdev, NULL);
@@ -161,8 +164,12 @@ static int ath_ahb_remove(struct platform_device *pdev)
         if (hw) {
                 struct ath_wiphy *aphy = hw->priv;
                 struct ath_softc *sc = aphy->sc;
+                struct ath_common *common = ath9k_hw_common(sc->sc_ah);
 
-                ath_cleanup(sc);
+                ath9k_deinit_device(sc);
+                free_irq(sc->irq, sc);
+                ieee80211_free_hw(sc->hw);
+                ath_bus_cleanup(common);
                 platform_set_drvdata(pdev, NULL);
         }