Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2018-10-10 22:04:15 +0200
committerTakashi Iwai <tiwai@suse.de>2018-10-10 22:04:58 +0200
commitf534b0920d573d2c2c6f8e4f7d933d856ae65980 (patch)
treedc061cc4a4726f2c5641910035411dc4c9848c69
parent59f750ce1cf5e38b2de439402d05fdc6186d9d66 (diff)
Revert "mwifiex: handle race during mwifiex_usb_disconnect"
(bsc#1051510).
-rw-r--r--patches.drivers/Revert-mwifiex-handle-race-during-mwifiex_usb_discon.patch38
-rw-r--r--series.conf1
2 files changed, 39 insertions, 0 deletions
diff --git a/patches.drivers/Revert-mwifiex-handle-race-during-mwifiex_usb_discon.patch b/patches.drivers/Revert-mwifiex-handle-race-during-mwifiex_usb_discon.patch
new file mode 100644
index 0000000000..d27ef2a8a5
--- /dev/null
+++ b/patches.drivers/Revert-mwifiex-handle-race-during-mwifiex_usb_discon.patch
@@ -0,0 +1,38 @@
+From 7e58e741c001813c02cab17720835d56398f9ffc Mon Sep 17 00:00:00 2001
+From: Ganapathi Bhat <gbhat@marvell.com>
+Date: Fri, 1 Jun 2018 16:11:19 +0530
+Subject: [PATCH] Revert "mwifiex: handle race during mwifiex_usb_disconnect"
+Git-commit: 7e58e741c001813c02cab17720835d56398f9ffc
+Patch-mainline: v4.18-rc6
+References: bsc#1051510
+
+This reverts commit b817047ae70c0bd67b677b65d0d69d72cd6e9728.
+
+We have a better fix for this issue, which will be sent on top
+of this revert.
+
+Signed-off-by: Ganapathi Bhat <gbhat@marvell.com>
+Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ drivers/net/wireless/marvell/mwifiex/usb.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/drivers/net/wireless/marvell/mwifiex/usb.c b/drivers/net/wireless/marvell/mwifiex/usb.c
+index 6e3cf9817730..bc475b83bb15 100644
+--- a/drivers/net/wireless/marvell/mwifiex/usb.c
++++ b/drivers/net/wireless/marvell/mwifiex/usb.c
+@@ -644,9 +644,6 @@ static void mwifiex_usb_disconnect(struct usb_interface *intf)
+ MWIFIEX_FUNC_SHUTDOWN);
+ }
+
+- if (adapter->workqueue)
+- flush_workqueue(adapter->workqueue);
+-
+ mwifiex_usb_free(card);
+
+ mwifiex_dbg(adapter, FATAL,
+--
+2.18.0
+
diff --git a/series.conf b/series.conf
index fca3618bca..8af19583c8 100644
--- a/series.conf
+++ b/series.conf
@@ -16816,6 +16816,7 @@
patches.arch/kvmclock-fix-tsc-calibration-for-nested-guests
patches.drivers/rtlwifi-Fix-kernel-Oops-Fw-download-fail
patches.drivers/brcmfmac-stop-watchdog-before-detach-and-free-everyt
+ patches.drivers/Revert-mwifiex-handle-race-during-mwifiex_usb_discon.patch
patches.drivers/rtlwifi-rtl8821ae-fix-firmware-is-not-ready-to-run
patches.drivers/ath10k-update-the-phymode-along-with-bandwidth-chang
patches.suse/gen_stats-Fix-netlink-stats-dumping-in-the-presence-.patch