diff options
| author | David S. Miller <davem@davemloft.net> | 2011-05-25 13:28:55 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-25 13:28:55 -0400 |
| commit | 22e95ac87d62bdc65b8a694a23cd4a364689b013 (patch) | |
| tree | 5ac900300ad1d4a8d8118545e3e971862de70ea4 /drivers/net/wireless/rtlwifi/ps.c | |
| parent | 6b3678354647a653e669746c05765f05d2b90239 (diff) | |
| parent | 31ec97d9cebac804814de298592648f7c18d8281 (diff) | |
Merge branch 'for-davem' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/rtlwifi/ps.c')
| -rw-r--r-- | drivers/net/wireless/rtlwifi/ps.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rtlwifi/ps.c b/drivers/net/wireless/rtlwifi/ps.c index 2bb71195e97..39b0297ce92 100644 --- a/drivers/net/wireless/rtlwifi/ps.c +++ b/drivers/net/wireless/rtlwifi/ps.c @@ -190,7 +190,7 @@ static void _rtl_ps_inactive_ps(struct ieee80211_hw *hw) ppsc->swrf_processing = true; - if (ppsc->inactive_pwrstate == ERFOFF && + if (ppsc->inactive_pwrstate == ERFON && rtlhal->interface == INTF_PCI) { if ((ppsc->reg_rfps_level & RT_RF_OFF_LEVL_ASPM) && RT_IN_PS_LEVEL(ppsc, RT_PS_LEVEL_ASPM) && |