| Message ID | X85sVGVP/0XvlrEJ@mwanda (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 59ec8e2fa5aaed6afd18d5362dc131aab92406e7 |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | ath11k: unlock on error path in ath11k_mac_op_add_interface() | expand |
Dan Carpenter <dan.carpenter@oracle.com> wrote: > These error paths need to drop the &ar->conf_mutex before returning. > > Fixes: 690ace20ff79 ("ath11k: peer delete synchronization with firmware") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > Signed-off-by: Kalle Valo <kvalo@codeaurora.org> Patch applied to ath-next branch of ath.git, thanks. 59ec8e2fa5aa ath11k: unlock on error path in ath11k_mac_op_add_interface()
diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c index ebed24ec7368..12cc16003e30 100644 --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c @@ -4615,13 +4615,13 @@ static int ath11k_mac_op_add_interface(struct ieee80211_hw *hw, if (ret) { ath11k_warn(ar->ab, "failed to delete peer vdev_id %d addr %pM\n", arvif->vdev_id, vif->addr); - return ret; + goto err; } ret = ath11k_wait_for_peer_delete_done(ar, arvif->vdev_id, vif->addr); if (ret) - return ret; + goto err; ar->num_peers--; }
These error paths need to drop the &ar->conf_mutex before returning. Fixes: 690ace20ff79 ("ath11k: peer delete synchronization with firmware") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> --- drivers/net/wireless/ath/ath11k/mac.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)