]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
ath9k: unlock on error path in ath9k_change_interface()
authorDan Carpenter <error27@gmail.com>
Tue, 21 Dec 2010 03:59:06 +0000 (06:59 +0300)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 22 Dec 2010 20:43:27 +0000 (15:43 -0500)
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>
drivers/net/wireless/ath/ath9k/main.c

index 0348731accae26b3a481cb45d74369c9075f07b7..c5cf8639e721ef91facd67cdd85edc9b418b71ef 100644 (file)
@@ -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,