summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/mwifiex
diff options
context:
space:
mode:
authorJohn W. Linville2013-03-01 19:52:03 +0100
committerJohn W. Linville2013-03-01 19:52:03 +0100
commit98b7ff9a4977e4f4f451c30288b197ad79e5ab7f (patch)
treeb0aae5739f08a2c3fd822e2b86dd1a369fd2e0a2 /drivers/net/wireless/mwifiex
parentnet/phy: micrel: Disable asymmetric pause for KSZ9021 (diff)
parentlibertas: fix crash for SD8688 (diff)
downloadkernel-qcow2-linux-98b7ff9a4977e4f4f451c30288b197ad79e5ab7f.tar.gz
kernel-qcow2-linux-98b7ff9a4977e4f4f451c30288b197ad79e5ab7f.tar.xz
kernel-qcow2-linux-98b7ff9a4977e4f4f451c30288b197ad79e5ab7f.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'drivers/net/wireless/mwifiex')
-rw-r--r--drivers/net/wireless/mwifiex/pcie.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/mwifiex/pcie.c b/drivers/net/wireless/mwifiex/pcie.c
index 35c79722c361..5c395e2e6a2b 100644
--- a/drivers/net/wireless/mwifiex/pcie.c
+++ b/drivers/net/wireless/mwifiex/pcie.c
@@ -302,7 +302,7 @@ static int mwifiex_pm_wakeup_card(struct mwifiex_adapter *adapter)
i++;
usleep_range(10, 20);
/* 50ms max wait */
- if (i == 50000)
+ if (i == 5000)
break;
}