diff options
| author | Dan Carpenter <error27@gmail.com> | 2010-12-21 06:59:06 +0300 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-12-22 15:43:27 -0500 |
| commit | 6dab55bf7eb52ca21d5e6c97b97f70875fe41ddc (patch) | |
| tree | 78fe102bd2c9eb939a3ba6a13288e21fae263cd6 /drivers/net/wireless/ath/ath9k/main.c | |
| parent | 8d6a686a0d20d39c202fdfc6fa7f1daf1d6e3b35 (diff) | |
| download | kernel_samsung_tuna-6dab55bf7eb52ca21d5e6c97b97f70875fe41ddc.zip kernel_samsung_tuna-6dab55bf7eb52ca21d5e6c97b97f70875fe41ddc.tar.gz kernel_samsung_tuna-6dab55bf7eb52ca21d5e6c97b97f70875fe41ddc.tar.bz2 | |
ath9k: unlock on error path in ath9k_change_interface()
There is a missing unlock when we hit the "No beacon slot available"
error condition.
Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/main.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/main.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index 0348731..c5cf863 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c @@ -1456,6 +1456,7 @@ static int ath9k_change_interface(struct ieee80211_hw *hw, struct ath_wiphy *aphy = hw->priv; struct ath_softc *sc = aphy->sc; struct ath_common *common = ath9k_hw_common(sc->sc_ah); + int ret = 0; ath_dbg(common, ATH_DBG_CONFIG, "Change Interface\n"); mutex_lock(&sc->mutex); @@ -1465,7 +1466,8 @@ static int ath9k_change_interface(struct ieee80211_hw *hw, case NL80211_IFTYPE_ADHOC: if (sc->nbcnvifs >= ATH_BCBUF) { ath_err(common, "No beacon slot available\n"); - return -ENOBUFS; + ret = -ENOBUFS; + goto out; } break; case NL80211_IFTYPE_STATION: @@ -1479,14 +1481,15 @@ static int ath9k_change_interface(struct ieee80211_hw *hw, default: ath_err(common, "Interface type %d not yet supported\n", vif->type); - mutex_unlock(&sc->mutex); - return -ENOTSUPP; + ret = -ENOTSUPP; + goto out; } vif->type = new_type; vif->p2p = p2p; +out: mutex_unlock(&sc->mutex); - return 0; + return ret; } static void ath9k_remove_interface(struct ieee80211_hw *hw, |