diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2011-11-09 13:00:24 -0800 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2011-11-11 16:14:22 -0800 |
| commit | 1720a91d03e84daa68e5c121b59e24dbdde40d9e (patch) | |
| tree | 0f02f1919b7f58e84083cbc7e418a16d3349d6bd /drivers | |
| parent | 766aaa604cda5d23a88eb0f8495b49ec59ca6db7 (diff) | |
| download | kernel_samsung_crespo-1720a91d03e84daa68e5c121b59e24dbdde40d9e.zip kernel_samsung_crespo-1720a91d03e84daa68e5c121b59e24dbdde40d9e.tar.gz kernel_samsung_crespo-1720a91d03e84daa68e5c121b59e24dbdde40d9e.tar.bz2 | |
net: wireless: bcmdhd: Call init_ioctl() only if was started properly
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/bcmdhd/wl_android.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/bcmdhd/wl_android.c b/drivers/net/wireless/bcmdhd/wl_android.c index 7c6ab2f..9ca3d60 100644 --- 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; |