rsi: missing unlocks on error paths

There is a missing unlock if rsi_find_sta() fails in
rsi_mac80211_ampdu_action() or if we hit the -EINVAL path in
rsi_mac80211_sta_add().

Fixes: 3528608f3a79 ("rsi: handle station connection in AP mode")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/rsi/rsi_91x_mac80211.c b/drivers/net/wireless/rsi/rsi_91x_mac80211.c
index 5c4c43dfdf33d01506771dda5b8dc7c52bd8e0a7..fa12c05d9e237c1d615990456b50cbe987187cf4 100644 (file)
--- a/drivers/net/wireless/rsi/rsi_91x_mac80211.c
+++ b/drivers/net/wireless/rsi/rsi_91x_mac80211.c
@@ -906,7 +906,8 @@ static int rsi_mac80211_ampdu_action(struct ieee80211_hw *hw,
                rsta = rsi_find_sta(common, sta->addr);
                if (!rsta) {
                        rsi_dbg(ERR_ZONE, "No station mapped\n");
-                       return 0;
+                       status = 0;
+                       goto unlock;
                }
                sta_id = rsta->sta_id;
        }
@@ -974,6 +975,7 @@ static int rsi_mac80211_ampdu_action(struct ieee80211_hw *hw,
                break;
        }
 
+unlock:
        mutex_unlock(&common->mutex);
        return status;
 }
@@ -1202,6 +1204,7 @@ static int rsi_mac80211_sta_add(struct ieee80211_hw *hw,
        struct rsi_common *common = adapter->priv;
        bool sta_exist = false;
        struct rsi_sta *rsta;
+       int status = 0;
 
        rsi_dbg(INFO_ZONE, "Station Add: %pM\n", sta->addr);
 
@@ -1215,8 +1218,8 @@ static int rsi_mac80211_sta_add(struct ieee80211_hw *hw,
                /* Check if max stations reached */
                if (common->num_stations >= common->max_stations) {
                        rsi_dbg(ERR_ZONE, "Reject: Max Stations exists\n");
-                       mutex_unlock(&common->mutex);
-                       return -EOPNOTSUPP;
+                       status = -EOPNOTSUPP;
+                       goto unlock;
                }
                for (cnt = 0; cnt < common->max_stations; cnt++) {
                        rsta = &common->stations[cnt];
@@ -1241,7 +1244,8 @@ static int rsi_mac80211_sta_add(struct ieee80211_hw *hw,
                        rsi_dbg(ERR_ZONE,
                                "%s: Some problem reaching here...\n",
                                __func__);
-                       return -EINVAL;
+                       status = -EINVAL;
+                       goto unlock;
                }
                rsta = &common->stations[sta_idx];
                rsta->sta = sta;
@@ -1289,9 +1293,10 @@ static int rsi_mac80211_sta_add(struct ieee80211_hw *hw,
                }
        }
 
+unlock:
        mutex_unlock(&common->mutex);
 
-       return 0;
+       return status;
 }
 
 /**