wl1271: Fix IRQ enable handling on FW init failure

Disable IRQ's after FW initialization failure - originally this was not
done in all cases, and it resulted in a kernel warning if firmware
initialization was tried again without reboot.

Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 30 insertions, 12 deletions

diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c
index eba38dff871b..7f1093cd816c 100644
--- a/drivers/net/wireless/wl12xx/wl1271_main.c
+++ b/drivers/net/wireless/wl12xx/wl1271_main.c
@@ -625,7 +625,7 @@ static int wl1271_chip_wakeup(struct wl1271 *wl)
 
                 ret = wl1271_setup(wl);
                 if (ret < 0)
-                        goto out;
+                        goto out_power_off;
                 break;
         case CHIP_ID_1271_PG20:
                 wl1271_debug(DEBUG_BOOT, "chip id 0x%x (1271 PG20)",
@@ -633,27 +633,32 @@ static int wl1271_chip_wakeup(struct wl1271 *wl)
 
                 ret = wl1271_setup(wl);
                 if (ret < 0)
-                        goto out;
+                        goto out_power_off;
                 break;
         default:
                 wl1271_error("unsupported chip id: 0x%x", wl->chip.id);
                 ret = -ENODEV;
-                goto out;
+                goto out_power_off;
         }
 
         if (wl->fw == NULL) {
                 ret = wl1271_fetch_firmware(wl);
                 if (ret < 0)
-                        goto out;
+                        goto out_power_off;
         }
 
         /* No NVS from netlink, try to get it from the filesystem */
         if (wl->nvs == NULL) {
                 ret = wl1271_fetch_nvs(wl);
                 if (ret < 0)
-                        goto out;
+                        goto out_power_off;
         }
 
+        goto out;
+
+out_power_off:
+        wl1271_power_off(wl);
+
 out:
         return ret;
 }
@@ -749,13 +754,21 @@ int wl1271_plt_start(struct wl1271 *wl)
 
         ret = wl1271_boot(wl);
         if (ret < 0)
-                goto out;
+                goto out_power_off;
 
         wl1271_notice("firmware booted in PLT mode (%s)", wl->chip.fw_ver);
 
         ret = wl1271_plt_init(wl);
         if (ret < 0)
-                goto out;
+                goto out_irq_disable;
+
+        goto out;
+
+out_irq_disable:
+        wl1271_disable_interrupts(wl);
+
+out_power_off:
+        wl1271_power_off(wl);
 
 out:
         mutex_unlock(&wl->mutex);
@@ -843,20 +856,25 @@ static int wl1271_op_start(struct ieee80211_hw *hw)
 
         ret = wl1271_boot(wl);
         if (ret < 0)
-                goto out;
+                goto out_power_off;
 
         ret = wl1271_hw_init(wl);
         if (ret < 0)
-                goto out;
+                goto out_irq_disable;
 
         wl->state = WL1271_STATE_ON;
 
         wl1271_info("firmware booted (%s)", wl->chip.fw_ver);
 
-out:
-        if (ret < 0)
-                wl1271_power_off(wl);
+        goto out;
+
+out_irq_disable:
+        wl1271_disable_interrupts(wl);
 
+out_power_off:
+        wl1271_power_off(wl);
+
+out:
         mutex_unlock(&wl->mutex);
 
         return ret;