3 files changed, 5 insertions, 2 deletions

diff --git a/drivers/net/wireless/rtlwifi/base.c b/drivers/net/wireless/rtlwifi/base.c
index d81a6021a30..7c1d82d8d71 100644
--- a/drivers/net/wireless/rtlwifi/base.c
+++ b/drivers/net/wireless/rtlwifi/base.c
@@ -449,6 +449,7 @@ int rtl_init_core(struct ieee80211_hw *hw)
         /* <4> locks */
         mutex_init(&rtlpriv->locks.conf_mutex);
         mutex_init(&rtlpriv->locks.ps_mutex);
+        spin_lock_init(&rtlpriv->locks.ips_lock);
         spin_lock_init(&rtlpriv->locks.irq_th_lock);
         spin_lock_init(&rtlpriv->locks.h2c_lock);
         spin_lock_init(&rtlpriv->locks.rf_ps_lock);
diff --git a/drivers/net/wireless/rtlwifi/ps.c b/drivers/net/wireless/rtlwifi/ps.c
index a14a68b2463..130fdd99d57 100644
--- a/drivers/net/wireless/rtlwifi/ps.c
+++ b/drivers/net/wireless/rtlwifi/ps.c
@@ -237,11 +237,12 @@ void rtl_ips_nic_on(struct ieee80211_hw *hw)
         struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
         struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
         enum rf_pwrstate rtstate;
+        unsigned long flags;
 
         if (mac->opmode != NL80211_IFTYPE_STATION)
                 return;
 
-        mutex_lock(&rtlpriv->locks.ps_mutex);
+        spin_lock_irqsave(&rtlpriv->locks.ips_lock, flags);
 
         if (ppsc->inactiveps) {
                 rtstate = ppsc->rfpwr_state;
@@ -257,7 +258,7 @@ void rtl_ips_nic_on(struct ieee80211_hw *hw)
                 }
         }
 
-        mutex_unlock(&rtlpriv->locks.ps_mutex);
+        spin_unlock_irqrestore(&rtlpriv->locks.ips_lock, flags);
 }
 
 /*for FW LPS*/
diff --git a/drivers/net/wireless/rtlwifi/wifi.h b/drivers/net/wireless/rtlwifi/wifi.h
index 085dccdbd1b..115969df0c9 100644
--- a/drivers/net/wireless/rtlwifi/wifi.h
+++ b/drivers/net/wireless/rtlwifi/wifi.h
@@ -1547,6 +1547,7 @@ struct rtl_locks {
         struct mutex ps_mutex;
 
         /*spin lock */
+        spinlock_t ips_lock;
         spinlock_t irq_th_lock;
         spinlock_t h2c_lock;
         spinlock_t rf_ps_lock;