drivers: staging: rtl8723bs: Fix locking in rtw_scan_timeout_handler()
Commitcc7ad0d77b
("drivers: staging: rtl8723bs: Fix deadlock in rtw_surveydone_event_callback()") besides fixing the deadlock also modified rtw_scan_timeout_handler() to use spin_[un]lock_irq() instead of spin_[un]lock_bh(). Disabling the IRQs is not necessary since all code taking this lock runs from either user contexts or from softirqs rtw_scan_timeout_handler() is the only function taking pmlmepriv->lock which uses spin_[un]lock_irq() for this. Switch back to spin_[un]lock_bh() to make it consistent with the rest of the code. Fixes:cc7ad0d77b
("drivers: staging: rtl8723bs: Fix deadlock in rtw_surveydone_event_callback()") Cc: Duoming Zhou <duoming@zju.edu.cn> Signed-off-by: Hans de Goede <hdegoede@redhat.com> Link: https://lore.kernel.org/r/20230221145326.7808-2-hdegoede@redhat.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Родитель
215792eda0
Коммит
3f46703609
|
@ -1590,11 +1590,11 @@ void rtw_scan_timeout_handler(struct timer_list *t)
|
|||
mlmepriv.scan_to_timer);
|
||||
struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
|
||||
|
||||
spin_lock_irq(&pmlmepriv->lock);
|
||||
spin_lock_bh(&pmlmepriv->lock);
|
||||
|
||||
_clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY);
|
||||
|
||||
spin_unlock_irq(&pmlmepriv->lock);
|
||||
spin_unlock_bh(&pmlmepriv->lock);
|
||||
|
||||
rtw_indicate_scan_done(adapter, true);
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче