Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c262dc06 authored by Lior David's avatar Lior David Committed by Greg Kroah-Hartman
Browse files

wil6210: fix locking in wmi_call 



[ Upstream commit dc57731dbd535880fe6ced31c229262c34df7d64 ]

Switch from spin_lock to spin_lock_irqsave, because
wmi_ev_lock is used inside interrupt handler.

Signed-off-by: default avatarLior David <liord@codeaurora.org>
Signed-off-by: default avatarMaya Erez <merez@codeaurora.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent ccb2390e

drivers/net/wireless/ath/wil6210/wmi.c

+5 −4
Original line number Diff line number Diff line
@@ -1639,16 +1639,17 @@ int wmi_call(struct wil6210_priv *wil, u16 cmdid, u8 mid, void *buf, u16 len, 
{

	int rc;

	unsigned long remain;

	ulong flags;



	mutex_lock(&wil->wmi_mutex);



	spin_lock(&wil->wmi_ev_lock);

	spin_lock_irqsave(&wil->wmi_ev_lock, flags);

	wil->reply_id = reply_id;

	wil->reply_mid = mid;

	wil->reply_buf = reply;

	wil->reply_size = reply_size;

	reinit_completion(&wil->wmi_call);

	spin_unlock(&wil->wmi_ev_lock);

	spin_unlock_irqrestore(&wil->wmi_ev_lock, flags);



	rc = __wmi_send(wil, cmdid, mid, buf, len);

	if (rc)
@@ -1668,12 +1669,12 @@ int wmi_call(struct wil6210_priv *wil, u16 cmdid, u8 mid, void *buf, u16 len, 
	}



out:

	spin_lock(&wil->wmi_ev_lock);

	spin_lock_irqsave(&wil->wmi_ev_lock, flags);

	wil->reply_id = 0;

	wil->reply_mid = U8_MAX;

	wil->reply_buf = NULL;

	wil->reply_size = 0;

	spin_unlock(&wil->wmi_ev_lock);

	spin_unlock_irqrestore(&wil->wmi_ev_lock, flags);



	mutex_unlock(&wil->wmi_mutex);