mwifiex: wait for firmware

[cascardo/linux.git] / drivers / net / wireless / mwifiex / main.c

diff --git a/drivers/net/wireless/mwifiex/main.c b/drivers/net/wireless/mwifiex/main.c
index cf0c5fc..dad3dd0 100644 (file)
--- a/drivers/net/wireless/mwifiex/main.c
+++ b/drivers/net/wireless/mwifiex/main.c
@@ -377,13 +377,15 @@ static int mwifiex_init_hw_fw(struct mwifiex_adapter *adapter)
 {
        int ret;
 
+       const struct firmware *fw;
+
        init_completion(&adapter->fw_load);
-       ret = request_firmware_nowait(THIS_MODULE, 1, adapter->fw_name,
-                                     adapter->dev, GFP_KERNEL, adapter,
-                                     mwifiex_fw_dpc);
+       ret = request_firmware(&fw, adapter->fw_name, adapter->dev);
        if (ret < 0)
                dev_err(adapter->dev,
-                       "request_firmware_nowait() returned error %d\n", ret);
+                       "request_firmware() returned error %d\n", ret);
+       else
+               mwifiex_fw_dpc(fw, adapter);
        return ret;
 }