diff options
| author | John W. Linville | 2013-03-18 14:39:21 +0100 |
|---|---|---|
| committer | John W. Linville | 2013-03-18 14:39:21 +0100 |
| commit | 49c87cd1eac1f798c5bad7f7eb809e6df36b6c56 (patch) | |
| tree | 8d6905466a05d6539e06d189cf88b71095ac0a79 /drivers/net/wireless/mwifiex/pcie.c | |
| parent | b43: HT-PHY: enable basic TX power setup (diff) | |
| parent | rtlwifi: rtl8192cu: Fix problem that prevents reassociation (diff) | |
| download | kernel-qcow2-linux-49c87cd1eac1f798c5bad7f7eb809e6df36b6c56.tar.gz kernel-qcow2-linux-49c87cd1eac1f798c5bad7f7eb809e6df36b6c56.tar.xz kernel-qcow2-linux-49c87cd1eac1f798c5bad7f7eb809e6df36b6c56.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
net/nfc/llcp/llcp.c
Diffstat (limited to 'drivers/net/wireless/mwifiex/pcie.c')
| -rw-r--r-- | drivers/net/wireless/mwifiex/pcie.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/mwifiex/pcie.c b/drivers/net/wireless/mwifiex/pcie.c index b813a27ee613..6283294398bf 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; } |