| Message ID | 20210714090321.3388341-1-nobuhiro1.iwamatsu@toshiba.co.jp |
|---|---|
| State | New |
| Headers | show |
| Series | [for,5.10.y] ath11k: unlock on error path in ath11k_mac_op_add_interface() | expand |
On Wed, Jul 14, 2021 at 06:03:21PM +0900, Nobuhiro Iwamatsu wrote: > From: Dan Carpenter <dan.carpenter@oracle.com> > > commit 59ec8e2fa5aaed6afd18d5362dc131aab92406e7 upstream. > > 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> > Link: https://lore.kernel.org/r/X85sVGVP/0XvlrEJ@mwanda > Signed-off-by: Nobuhiro Iwamatsu (CIP) <nobuhiro1.iwamatsu@toshiba.co.jp> > --- > drivers/net/wireless/ath/ath11k/mac.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Now queued up, thanks. greg k-h
diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c index e9e6b0c4de220a..7b9acb265a5628 100644 --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c @@ -4597,13 +4597,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--; }