From 59a4cc2539076f868f2a3fcd7a3385a26928a27a Mon Sep 17 00:00:00 2001 From: Amitkumar Karwar Date: Mon, 9 Apr 2012 20:06:57 -0700 Subject: 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 Signed-off-by: Kiran Divekar Signed-off-by: Bing Zhao Signed-off-by: John W. Linville --- drivers/net/wireless/mwifiex/pcie.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'drivers/net/wireless/mwifiex/pcie.c') diff --git a/drivers/net/wireless/mwifiex/pcie.c b/drivers/net/wireless/mwifiex/pcie.c index 5867facd415..13fbc4eb159 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) -- cgit v1.2.3-70-g09d2