diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-08-12 07:41:14 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-08-12 07:41:14 +0200 |
| commit | b2a878de11251b06be144b5905e37dd0dc0b0104 (patch) | |
| tree | f510ac1263ebd939493c3358408325804f7ba6e2 /drivers/staging/wilc1000 | |
| parent | 3f411e8c99e3354adc10350d0e2ee14914fd1961 (diff) | |
| parent | d45331b00ddb179e291766617259261c112db872 (diff) | |
| download | linux-stable-b2a878de11251b06be144b5905e37dd0dc0b0104.tar.gz linux-stable-b2a878de11251b06be144b5905e37dd0dc0b0104.tar.bz2 linux-stable-b2a878de11251b06be144b5905e37dd0dc0b0104.zip | |
Merge 5.3-rc4 into staging-next
We need the iio/staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/wilc1000')
| -rw-r--r-- | drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c index f3b12f3b6d61..22f21831649b 100644 --- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c @@ -1938,6 +1938,7 @@ void wilc_deinit_host_int(struct net_device *net) priv->p2p_listen_state = false; + flush_workqueue(vif->wilc->hif_workqueue); mutex_destroy(&priv->scan_req_lock); ret = wilc_deinit(vif); |