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 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
drivers
/
net
/
wireless
/
ath
/
carl9170
/
fw.c
diff --git
a/drivers/net/wireless/ath/carl9170/fw.c
b/drivers/net/wireless/ath/carl9170/fw.c
index
221957c
..
39ddea5
100644
(file)
--- a/
drivers/net/wireless/ath/carl9170/fw.c
+++ b/
drivers/net/wireless/ath/carl9170/fw.c
@@
-237,7
+237,7
@@
static int carl9170_fw(struct ar9170 *ar, const __u8 *data, size_t len)
ar->disable_offload = true;
}
ar->disable_offload = true;
}
- if (SUPP(CARL9170FW_PSM))
+ if (SUPP(CARL9170FW_PSM)
&& SUPP(CARL9170FW_FIXED_5GHZ_PSM)
)
ar->hw->flags |= IEEE80211_HW_SUPPORTS_PS;
if (!SUPP(CARL9170FW_USB_INIT_FIRMWARE)) {
ar->hw->flags |= IEEE80211_HW_SUPPORTS_PS;
if (!SUPP(CARL9170FW_USB_INIT_FIRMWARE)) {