summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorPhilipp Hortmann <philipp.g.hortmann@gmail.com>2023-05-14 23:40:33 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-05-28 12:11:34 +0300
commit35a70c0305f5e0805006b91a995610ef881e2091 (patch)
treef89b45792cbc87a3cd272dad6e8e3a208c67f656 /drivers
parentdffef6de4db2ddbf1d456e618d06b128b9d0018b (diff)
downloadlinux-35a70c0305f5e0805006b91a995610ef881e2091.tar.xz
staging: rtl8192e: Exclude scan_mutex in rtllib_softmac_stop_scan
Exclude scan_mutex from cancel_delayed_work_sync(&ieee->softmac_scan_wq) as ieee->softmac_scan_wq takes scan_mutex as well. Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> Link: https://lore.kernel.org/r/20230514204033.GA20187@matrix-ESPRIMO-P710 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/rtl8192e/rtllib_softmac.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c
index 18885cda60f6..cb2dd18fa14b 100644
--- a/drivers/staging/rtl8192e/rtllib_softmac.c
+++ b/drivers/staging/rtl8192e/rtllib_softmac.c
@@ -682,11 +682,11 @@ static void rtllib_softmac_stop_scan(struct rtllib_device *ieee)
if (ieee->scanning_continue == 1) {
ieee->scanning_continue = 0;
ieee->actscanning = false;
-
+ mutex_unlock(&ieee->scan_mutex);
cancel_delayed_work_sync(&ieee->softmac_scan_wq);
+ } else {
+ mutex_unlock(&ieee->scan_mutex);
}
-
- mutex_unlock(&ieee->scan_mutex);
}
void rtllib_stop_scan(struct rtllib_device *ieee)