net: wireless: bcmdhd: Call init_ioctl() only if was started properly

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

diff --git a/drivers/net/wireless/bcmdhd/wl_android.c b/drivers/net/wireless/bcmdhd/wl_android.c
index 7c6ab2fb2821994d6d2dc22b9d47b1ca9e71ec81..9ca3d6020239694bd7a45737da422ffcacd6108d 100644 (file)
--- a/drivers/net/wireless/bcmdhd/wl_android.c
+++ b/drivers/net/wireless/bcmdhd/wl_android.c
@@ -364,7 +364,8 @@ int wl_android_wifi_on(struct net_device *dev)
                sdioh_start(NULL, 0);
                ret = dhd_dev_reset(dev, FALSE);
                sdioh_start(NULL, 1);
-               dhd_dev_init_ioctl(dev);
+               if (!ret)
+                       dhd_dev_init_ioctl(dev);
                g_wifi_on = 1;
        }
        dhd_net_if_unlock(dev);
@@ -384,7 +385,7 @@ int wl_android_wifi_off(struct net_device *dev)
 
        dhd_net_if_lock(dev);
        if (g_wifi_on) {
-               dhd_dev_reset(dev, 1);
+               ret = dhd_dev_reset(dev, TRUE);
                sdioh_stop(NULL);
                dhd_customer_gpio_wlan_ctrl(WLAN_RESET_OFF);
                g_wifi_on = 0;