aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/realtek/rtlwifi/ps.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-07-30 10:04:58 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-07-30 10:04:58 +0200
commit8a7b5d0f75f757fa88b0d17c19523161b27b8e80 (patch)
tree54a3e7f1f995583ed924ff32cf5dacc800119800 /drivers/net/wireless/realtek/rtlwifi/ps.c
parent7bab01ecc6c43da882333c6db39741cb43677004 (diff)
parentacb1872577b346bd15ab3a3f8dff780d6cca4b70 (diff)
downloadkernel_replicant_linux-8a7b5d0f75f757fa88b0d17c19523161b27b8e80.tar.gz
kernel_replicant_linux-8a7b5d0f75f757fa88b0d17c19523161b27b8e80.tar.bz2
kernel_replicant_linux-8a7b5d0f75f757fa88b0d17c19523161b27b8e80.zip
Merge 4.18-rc7 into usb-next
We want the USB fixes in here as well to handle merge issues. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/wireless/realtek/rtlwifi/ps.c')
-rw-r--r--drivers/net/wireless/realtek/rtlwifi/ps.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/realtek/rtlwifi/ps.c b/drivers/net/wireless/realtek/rtlwifi/ps.c
index 71af24e2e051..479a4cfc245d 100644
--- a/drivers/net/wireless/realtek/rtlwifi/ps.c
+++ b/drivers/net/wireless/realtek/rtlwifi/ps.c
@@ -71,7 +71,7 @@ bool rtl_ps_disable_nic(struct ieee80211_hw *hw)
struct rtl_priv *rtlpriv = rtl_priv(hw);
/*<1> Stop all timer */
- rtl_deinit_deferred_work(hw);
+ rtl_deinit_deferred_work(hw, true);
/*<2> Disable Interrupt */
rtlpriv->cfg->ops->disable_interrupt(hw);
@@ -292,7 +292,7 @@ void rtl_ips_nic_on(struct ieee80211_hw *hw)
struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
enum rf_pwrstate rtstate;
- cancel_delayed_work(&rtlpriv->works.ips_nic_off_wq);
+ cancel_delayed_work_sync(&rtlpriv->works.ips_nic_off_wq);
mutex_lock(&rtlpriv->locks.ips_mutex);
if (ppsc->inactiveps) {