diff options
author | Larry Finger <Larry.Finger@lwfinger.net> | 2011-08-27 14:56:00 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-08-29 15:33:03 -0400 |
commit | 1ba45b9e3a366fee0603cda51e61935b7dc9db7d (patch) | |
tree | f5e16b585e10a242c0ca19e4b9fb15033f969bd0 | |
parent | cf3af74824b1bf2bd60eb6a0dd82b27f9e9236ac (diff) |
ath9k: Fix a smatch warnings
Smatch shows the following warnings:
CHECK drivers/net/wireless/ath/ath9k/htc_drv_main.c
drivers/net/wireless/ath/ath9k/htc_drv_main.c +1315 ath9k_htc_configure_filter(27) warn: inconsistent returns mutex:&priv->mutex: locked (1303) unlocked (1315)
CHECK drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c +3321 ar9300_eeprom_restore_internal(20) warn: returning -1 instead of -ENOMEM is sloppy
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/htc_drv_main.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c index 908463915b99..cb4c32eaef61 100644 --- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c +++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | |||
@@ -3318,7 +3318,7 @@ static int ar9300_eeprom_restore_internal(struct ath_hw *ah, | |||
3318 | 3318 | ||
3319 | word = kzalloc(2048, GFP_KERNEL); | 3319 | word = kzalloc(2048, GFP_KERNEL); |
3320 | if (!word) | 3320 | if (!word) |
3321 | return -1; | 3321 | return -ENOMEM; |
3322 | 3322 | ||
3323 | memcpy(mptr, &ar9300_default, mdata_size); | 3323 | memcpy(mptr, &ar9300_default, mdata_size); |
3324 | 3324 | ||
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/drivers/net/wireless/ath/ath9k/htc_drv_main.c index 0248024da56a..b9de1511add9 100644 --- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c +++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c | |||
@@ -1300,6 +1300,7 @@ static void ath9k_htc_configure_filter(struct ieee80211_hw *hw, | |||
1300 | if (priv->op_flags & OP_INVALID) { | 1300 | if (priv->op_flags & OP_INVALID) { |
1301 | ath_dbg(ath9k_hw_common(priv->ah), ATH_DBG_ANY, | 1301 | ath_dbg(ath9k_hw_common(priv->ah), ATH_DBG_ANY, |
1302 | "Unable to configure filter on invalid state\n"); | 1302 | "Unable to configure filter on invalid state\n"); |
1303 | mutex_unlock(&priv->mutex); | ||
1303 | return; | 1304 | return; |
1304 | } | 1305 | } |
1305 | ath9k_htc_ps_wakeup(priv); | 1306 | ath9k_htc_ps_wakeup(priv); |