diff options
| author | Larry Finger <Larry.Finger@lwfinger.net> | 2010-12-17 19:36:25 -0600 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-12-20 14:49:48 -0500 |
| commit | d704300fa546a613ec3821b908528b20685cb92a (patch) | |
| tree | f11a738d188c0f0538d385cb205a1149534c6014 | |
| parent | f0b3e4b7307f02a203029441b0473a84aebc6435 (diff) | |
rtlwifi: Fix use of mutex in interrupt code
A previous conversion from semaphoreto mutexes missed the fact that one
of the semaphores was used in interrupt code. Fixed by changing to
a spinlock.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | drivers/net/wireless/rtlwifi/base.c | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/rtlwifi/ps.c | 5 | ||||
| -rw-r--r-- | drivers/net/wireless/rtlwifi/wifi.h | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/drivers/net/wireless/rtlwifi/base.c b/drivers/net/wireless/rtlwifi/base.c index 87530eaa88b..77fa59af63d 100644 --- a/drivers/net/wireless/rtlwifi/base.c +++ b/drivers/net/wireless/rtlwifi/base.c @@ -309,8 +309,8 @@ int rtl_init_core(struct ieee80211_hw *hw) } /* <4> locks */ - mutex_init(&rtlpriv->locks.ips_mutex); mutex_init(&rtlpriv->locks.conf_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 22c293e5b88..d2326c13449 100644 --- a/drivers/net/wireless/rtlwifi/ps.c +++ b/drivers/net/wireless/rtlwifi/ps.c @@ -286,8 +286,9 @@ void rtl_ips_nic_on(struct ieee80211_hw *hw) struct rtl_priv *rtlpriv = rtl_priv(hw); struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw)); enum rf_pwrstate rtstate; + unsigned long flags; - mutex_lock(&rtlpriv->locks.ips_mutex); + spin_lock_irqsave(&rtlpriv->locks.ips_lock, flags); if (ppsc->b_inactiveps) { rtstate = ppsc->rfpwr_state; @@ -303,7 +304,7 @@ void rtl_ips_nic_on(struct ieee80211_hw *hw) } } - mutex_unlock(&rtlpriv->locks.ips_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 77d5fa370bd..d44d79613d2 100644 --- a/drivers/net/wireless/rtlwifi/wifi.h +++ b/drivers/net/wireless/rtlwifi/wifi.h @@ -1192,11 +1192,11 @@ struct rtl_hal_cfg { }; struct rtl_locks { - /*sem */ - struct mutex ips_mutex; + /* mutex */ struct mutex conf_mutex; /*spin lock */ + spinlock_t ips_lock; spinlock_t irq_th_lock; spinlock_t h2c_lock; spinlock_t rf_ps_lock; |