From 9992f04a905b315957fb2d7a7ae1733f34b7210c Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 11 Aug 2019 17:39:47 +0200 Subject: [PATCH] drop staging patch from 4.19 --- queue-4.19/series | 1 - ...the-workqueue-before-deinit-the-host.patch | 31 ------------------- 2 files changed, 32 deletions(-) delete mode 100644 queue-4.19/staging-wilc1000-flush-the-workqueue-before-deinit-the-host.patch diff --git a/queue-4.19/series b/queue-4.19/series index 7bd979b1c9b..479b7053249 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -1,7 +1,6 @@ iio-cros_ec_accel_legacy-fix-incorrect-channel-setting.patch iio-adc-max9611-fix-misuse-of-genmask-macro.patch staging-gasket-apex-fix-copy-paste-typo.patch -staging-wilc1000-flush-the-workqueue-before-deinit-the-host.patch staging-android-ion-bail-out-upon-sigkill-when-allocating-memory.patch crypto-ccp-fix-oops-by-properly-managing-allocated-structures.patch crypto-ccp-add-support-for-valid-authsize-values-less-than-16.patch diff --git a/queue-4.19/staging-wilc1000-flush-the-workqueue-before-deinit-the-host.patch b/queue-4.19/staging-wilc1000-flush-the-workqueue-before-deinit-the-host.patch deleted file mode 100644 index 2bb01154702..00000000000 --- a/queue-4.19/staging-wilc1000-flush-the-workqueue-before-deinit-the-host.patch +++ /dev/null @@ -1,31 +0,0 @@ -From fb2b055b7e6e44efda737c7c92f46c0868bb04e5 Mon Sep 17 00:00:00 2001 -From: Adham Abozaeid -Date: Mon, 22 Jul 2019 21:38:44 +0000 -Subject: staging: wilc1000: flush the workqueue before deinit the host - -From: Adham Abozaeid - -commit fb2b055b7e6e44efda737c7c92f46c0868bb04e5 upstream. - -Before deinitializing the host interface, the workqueue should be flushed -to handle any pending deferred work - -Signed-off-by: Adham Abozaeid -Cc: stable -Link: https://lore.kernel.org/r/20190722213837.21952-1-adham.abozaeid@microchip.com -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c -+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c -@@ -2192,6 +2192,7 @@ int wilc_deinit_host_int(struct net_devi - - op_ifcs--; - -+ flush_workqueue(vif->wilc->hif_workqueue); - mutex_destroy(&priv->scan_req_lock); - ret = wilc_deinit(vif); - -- 2.47.3