diff options
author | Larry Finger <Larry.Finger@lwfinger.net> | 2010-12-17 20:36:25 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-12-20 14:49:48 -0500 |
commit | d704300fa546a613ec3821b908528b20685cb92a (patch) | |
tree | f11a738d188c0f0538d385cb205a1149534c6014 /drivers/net/wireless/rtlwifi/base.c | |
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>
Diffstat (limited to 'drivers/net/wireless/rtlwifi/base.c')
-rw-r--r-- | drivers/net/wireless/rtlwifi/base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rtlwifi/base.c b/drivers/net/wireless/rtlwifi/base.c index 87530eaa88bd..77fa59af63d8 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) | |||
309 | } | 309 | } |
310 | 310 | ||
311 | /* <4> locks */ | 311 | /* <4> locks */ |
312 | mutex_init(&rtlpriv->locks.ips_mutex); | ||
313 | mutex_init(&rtlpriv->locks.conf_mutex); | 312 | mutex_init(&rtlpriv->locks.conf_mutex); |
313 | spin_lock_init(&rtlpriv->locks.ips_lock); | ||
314 | spin_lock_init(&rtlpriv->locks.irq_th_lock); | 314 | spin_lock_init(&rtlpriv->locks.irq_th_lock); |
315 | spin_lock_init(&rtlpriv->locks.h2c_lock); | 315 | spin_lock_init(&rtlpriv->locks.h2c_lock); |
316 | spin_lock_init(&rtlpriv->locks.rf_ps_lock); | 316 | spin_lock_init(&rtlpriv->locks.rf_ps_lock); |