aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/mwifiex/sdio.c
diff options
context:
space:
mode:
authorAmitkumar Karwar <akarwar@marvell.com>2012-04-09 23:06:57 -0400
committerJohn W. Linville <linville@tuxdriver.com>2012-04-12 15:10:30 -0400
commit59a4cc2539076f868f2a3fcd7a3385a26928a27a (patch)
tree9d63f460103d89b9b8d353ad33049a759e0db8a1 /drivers/net/wireless/mwifiex/sdio.c
parent13d7ba78b514d8b720a82b9bddaaee0c004f2a1f (diff)
mwifiex: use asynchronous firmware loading
Make use of request_firmware_nowait instead of request_firmware to load FW asynchronously. This fixes timeouts introduced with recent udev changes. Signed-off-by: Amitkumar Karwar <akarwar@marvell.com> Signed-off-by: Kiran Divekar <dkiran@marvell.com> Signed-off-by: Bing Zhao <bzhao@marvell.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/mwifiex/sdio.c')
-rw-r--r--drivers/net/wireless/mwifiex/sdio.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/mwifiex/sdio.c b/drivers/net/wireless/mwifiex/sdio.c
index f8012e2b7f7c..1aa45c4295bb 100644
--- a/drivers/net/wireless/mwifiex/sdio.c
+++ b/drivers/net/wireless/mwifiex/sdio.c
@@ -123,6 +123,9 @@ mwifiex_sdio_remove(struct sdio_func *func)
123 if (!adapter || !adapter->priv_num) 123 if (!adapter || !adapter->priv_num)
124 return; 124 return;
125 125
126 /* In case driver is removed when asynchronous FW load is in progress */
127 wait_for_completion(&adapter->fw_load);
128
126 if (user_rmmod) { 129 if (user_rmmod) {
127 if (adapter->is_suspended) 130 if (adapter->is_suspended)
128 mwifiex_sdio_resume(adapter->dev); 131 mwifiex_sdio_resume(adapter->dev);