aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmitkumar Karwar <akarwar@marvell.com>2013-07-22 22:17:53 -0400
committerJohn W. Linville <linville@tuxdriver.com>2013-07-24 11:02:10 -0400
commita76b20e5ca8a9ec0b45a4150b4ad19e27dd19699 (patch)
treed431fea52d46183645b01452e990bcbcef869bba
parentd00062e318b1e4a4bec8a8e343efe8bc92d3b109 (diff)
mwifiex: replace mdelay with msleep
It is observed that when wrong firmware is downloaded for PCIe card, system hangs for 10 seconds. The reason is mdelay() is used when firmware status is polled. Replace mdelay with msleep(non-blocking API) to fix the issue. Signed-off-by: Amitkumar Karwar <akarwar@marvell.com> Signed-off-by: Bing Zhao <bzhao@marvell.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/mwifiex/pcie.c2
-rw-r--r--drivers/net/wireless/mwifiex/sdio.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/mwifiex/pcie.c b/drivers/net/wireless/mwifiex/pcie.c
index dce648682694..098153f14e18 100644
--- a/drivers/net/wireless/mwifiex/pcie.c
+++ b/drivers/net/wireless/mwifiex/pcie.c
@@ -1942,7 +1942,7 @@ mwifiex_check_fw_status(struct mwifiex_adapter *adapter, u32 poll_num)
1942 ret = 0; 1942 ret = 0;
1943 break; 1943 break;
1944 } else { 1944 } else {
1945 mdelay(100); 1945 msleep(100);
1946 ret = -1; 1946 ret = -1;
1947 } 1947 }
1948 } 1948 }
diff --git a/drivers/net/wireless/mwifiex/sdio.c b/drivers/net/wireless/mwifiex/sdio.c
index 5ee5ed02eccd..14ac51fd7d3c 100644
--- a/drivers/net/wireless/mwifiex/sdio.c
+++ b/drivers/net/wireless/mwifiex/sdio.c
@@ -927,7 +927,7 @@ static int mwifiex_check_fw_status(struct mwifiex_adapter *adapter,
927 ret = 0; 927 ret = 0;
928 break; 928 break;
929 } else { 929 } else {
930 mdelay(100); 930 msleep(100);
931 ret = -1; 931 ret = -1;
932 } 932 }
933 } 933 }