git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'slab/urgent' into slab/next
[pandora-kernel.git]
/
drivers
/
net
/
wireless
/
ath
/
ath9k
/
ar9003_hw.c
diff --git
a/drivers/net/wireless/ath/ath9k/ar9003_hw.c
b/drivers/net/wireless/ath/ath9k/ar9003_hw.c
index
8efdec2
..
ad2bb2b
100644
(file)
--- a/
drivers/net/wireless/ath/ath9k/ar9003_hw.c
+++ b/
drivers/net/wireless/ath/ath9k/ar9003_hw.c
@@
-519,11
+519,7
@@
static void ar9003_hw_configpcipowersave(struct ath_hw *ah,
int restore,
int power_off)
{
int restore,
int power_off)
{
- if (ah->is_pciexpress != true)
- return;
-
- /* Do not touch SerDes registers */
- if (ah->config.pcie_powersave_enable == 2)
+ if (ah->is_pciexpress != true || ah->aspm_enabled != true)
return;
/* Nothing to do on restore for 11N */
return;
/* Nothing to do on restore for 11N */