diff options
| author | Amitkumar Karwar <akarwar@marvell.com> | 2012-04-09 20:06:57 -0700 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-04-12 15:10:30 -0400 |
| commit | 59a4cc2539076f868f2a3fcd7a3385a26928a27a (patch) | |
| tree | 9d63f460103d89b9b8d353ad33049a759e0db8a1 /drivers/net/wireless/mwifiex/pcie.c | |
| parent | 13d7ba78b514d8b720a82b9bddaaee0c004f2a1f (diff) | |
| download | op-kernel-dev-59a4cc2539076f868f2a3fcd7a3385a26928a27a.zip op-kernel-dev-59a4cc2539076f868f2a3fcd7a3385a26928a27a.tar.gz | |
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/pcie.c')
| -rw-r--r-- | drivers/net/wireless/mwifiex/pcie.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/mwifiex/pcie.c b/drivers/net/wireless/mwifiex/pcie.c index 5867fac..13fbc4e 100644 --- a/drivers/net/wireless/mwifiex/pcie.c +++ b/drivers/net/wireless/mwifiex/pcie.c @@ -119,6 +119,9 @@ static void mwifiex_pcie_remove(struct pci_dev *pdev) if (!adapter || !adapter->priv_num) return; + /* In case driver is removed when asynchronous FW load is in progress */ + wait_for_completion(&adapter->fw_load); + if (user_rmmod) { #ifdef CONFIG_PM if (adapter->is_suspended) |
