summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rtlwifi/wifi.h
diff options
context:
space:
mode:
authorLarry Finger2010-12-18 02:36:25 +0100
committerJohn W. Linville2010-12-20 20:49:48 +0100
commitd704300fa546a613ec3821b908528b20685cb92a (patch)
treef11a738d188c0f0538d385cb205a1149534c6014 /drivers/net/wireless/rtlwifi/wifi.h
parentMAINTAINERS: Fix typo in rtl8192ce entry (diff)
downloadkernel-qcow2-linux-d704300fa546a613ec3821b908528b20685cb92a.tar.gz
kernel-qcow2-linux-d704300fa546a613ec3821b908528b20685cb92a.tar.xz
kernel-qcow2-linux-d704300fa546a613ec3821b908528b20685cb92a.zip
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/wifi.h')
-rw-r--r--drivers/net/wireless/rtlwifi/wifi.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/rtlwifi/wifi.h b/drivers/net/wireless/rtlwifi/wifi.h
index 77d5fa370bdc..d44d79613d2d 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;