rt2x00: Fix race condition when using inderect registers

Indirect registers require multiple calls to the CSR
register in order to access the indirect registers.
This must be protected under a lock to prevent race
conditions which could cause invalid data to
be returned when reading from the indirect register or silent
failures when writing data to the indirect register.

USB drivers where already protected under a mutex,
so rename the mutex and make PCI drivers use the mutex
as well.
This now means that BBP and RF registers are no longer
accessible in interrupt context. That is not a bad
situation since the slow behavior of accessing
those registers means we don't _want_ to access them
in interrupt context either.

Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 5 insertions, 6 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.c b/drivers/net/wireless/rt2x00/rt2x00usb.c
index 4eb550fab2f6..c507b0d9409f 100644
--- a/drivers/net/wireless/rt2x00/rt2x00usb.c
+++ b/drivers/net/wireless/rt2x00/rt2x00usb.c
@@ -79,7 +79,7 @@ int rt2x00usb_vendor_req_buff_lock(struct rt2x00_dev *rt2x00dev,
 {
         int status;
 
-        BUG_ON(!mutex_is_locked(&rt2x00dev->usb_cache_mutex));
+        BUG_ON(!mutex_is_locked(&rt2x00dev->csr_mutex));
 
         /*
          * Check for Cache availability.
@@ -110,13 +110,13 @@ int rt2x00usb_vendor_request_buff(struct rt2x00_dev *rt2x00dev,
 {
         int status;
 
-        mutex_lock(&rt2x00dev->usb_cache_mutex);
+        mutex_lock(&rt2x00dev->csr_mutex);
 
         status = rt2x00usb_vendor_req_buff_lock(rt2x00dev, request,
                                                 requesttype, offset, buffer,
                                                 buffer_length, timeout);
 
-        mutex_unlock(&rt2x00dev->usb_cache_mutex);
+        mutex_unlock(&rt2x00dev->csr_mutex);
 
         return status;
 }
@@ -132,7 +132,7 @@ int rt2x00usb_vendor_request_large_buff(struct rt2x00_dev *rt2x00dev,
         unsigned char *tb;
         u16 off, len, bsize;
 
-        mutex_lock(&rt2x00dev->usb_cache_mutex);
+        mutex_lock(&rt2x00dev->csr_mutex);
 
         tb  = (char *)buffer;
         off = offset;
@@ -148,7 +148,7 @@ int rt2x00usb_vendor_request_large_buff(struct rt2x00_dev *rt2x00dev,
                 off += bsize;
         }
 
-        mutex_unlock(&rt2x00dev->usb_cache_mutex);
+        mutex_unlock(&rt2x00dev->csr_mutex);
 
         return status;
 }
@@ -531,7 +531,6 @@ int rt2x00usb_probe(struct usb_interface *usb_intf,
         rt2x00dev->dev = &usb_intf->dev;
         rt2x00dev->ops = ops;
         rt2x00dev->hw = hw;
-        mutex_init(&rt2x00dev->usb_cache_mutex);
 
         rt2x00dev->usb_maxpacket =
             usb_maxpacket(usb_dev, usb_sndbulkpipe(usb_dev, 1), 1);