From: Thadeu Lima de Souza Cascardo <cascardo@cascardo.eti.br>
Date: Mon, 25 Apr 2016 01:49:31 +0000 (+0000)
Subject: mwifiex: wait for firmware
X-Git-Url: http://git.cascardo.eti.br/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=017f4dadf0d08bb957770e9cc62f977326f354e4

mwifiex: wait for firmware
---

diff --git a/drivers/net/wireless/mwifiex/main.c b/drivers/net/wireless/mwifiex/main.c
index cf0c5fc7c2d2..dad3dd0824ba 100644
--- 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;
 }