aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorChirayu Desai <cdesai@cyanogenmod.org>2013-06-21 14:57:12 +0530
committerChirayu Desai <cdesai@cyanogenmod.org>2013-06-21 14:57:12 +0530
commita921f81fdcfec509021fcfe19dbca8650f95e7aa (patch)
tree84ee22c2d854ecd80c774ab37c2c3e1bdc1e1e04 /drivers/net/wireless
parentd744f55acdc539cd5b802bb10600ec0dcac46ea4 (diff)
parent937d4f9ee2fe18a6ab012a343fc3b620756b954e (diff)
downloadkernel_samsung_aries-a921f81fdcfec509021fcfe19dbca8650f95e7aa.zip
kernel_samsung_aries-a921f81fdcfec509021fcfe19dbca8650f95e7aa.tar.gz
kernel_samsung_aries-a921f81fdcfec509021fcfe19dbca8650f95e7aa.tar.bz2
Merge tag 'v3.0.83' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into HEAD
This is the 3.0.83 stable release
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/ath/ath9k/init.c3
-rw-r--r--drivers/net/wireless/b43/main.c2
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
index 5a9fd21..d6059a2 100644
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -704,8 +704,7 @@ void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw)
BIT(NL80211_IFTYPE_ADHOC) |
BIT(NL80211_IFTYPE_MESH_POINT);
- if (AR_SREV_5416(sc->sc_ah))
- hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;
+ hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;
hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 7c2e09a..4db716b 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -2309,7 +2309,7 @@ static int b43_request_firmware(struct b43_wldev *dev)
for (i = 0; i < B43_NR_FWTYPES; i++) {
errmsg = ctx->errors[i];
if (strlen(errmsg))
- b43err(dev->wl, errmsg);
+ b43err(dev->wl, "%s", errmsg);
}
b43_print_fw_helptext(dev->wl, 1);
err = -ENOENT;