2 files changed, 8 insertions, 10 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.c b/drivers/net/wireless/rt2x00/rt2x00usb.c
index 8d2081189025..66e47615f2a6 100644
--- a/drivers/net/wireless/rt2x00/rt2x00usb.c
+++ b/drivers/net/wireless/rt2x00/rt2x00usb.c
@@ -42,7 +42,7 @@ int rt2x00usb_vendor_request(const struct rt2x00_dev *rt2x00dev,
                              const u8 request, const u8 requesttype,
                              const u16 offset, const u16 value,
                              void *buffer, const u16 buffer_length,
-                             u16 timeout)
+                             const int timeout)
 {
         struct usb_device *usb_dev =
             interface_to_usbdev(rt2x00dev_usb(rt2x00dev));
@@ -60,12 +60,10 @@ int rt2x00usb_vendor_request(const struct rt2x00_dev *rt2x00dev,
                         return 0;
 
                 /*
-                 * Check for errors,
-                 * -ETIMEDOUT: We need a bit more time to complete.
+                 * Check for errors
                  * -ENODEV: Device has disappeared, no point continuing.
+                 * All other errors: Try again.
                  */
-                if (status == -ETIMEDOUT)
-                        timeout *= 2;
                 else if (status == -ENODEV)
                         break;
         }
@@ -81,7 +79,7 @@ EXPORT_SYMBOL_GPL(rt2x00usb_vendor_request);
 int rt2x00usb_vendor_request_buff(const struct rt2x00_dev *rt2x00dev,
                                   const u8 request, const u8 requesttype,
                                   const u16 offset, void *buffer,
-                                  const u16 buffer_length, u16 timeout)
+                                  const u16 buffer_length, const int timeout)
 {
         int status;
 
diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.h b/drivers/net/wireless/rt2x00/rt2x00usb.h
index d4113e5158f0..2681abe4d49e 100644
--- a/drivers/net/wireless/rt2x00/rt2x00usb.h
+++ b/drivers/net/wireless/rt2x00/rt2x00usb.h
@@ -44,7 +44,7 @@
  */
 #define REGISTER_BUSY_COUNT             5
 #define REGISTER_BUSY_DELAY             100
-#define REGISTER_TIMEOUT                20
+#define REGISTER_TIMEOUT                500
 #define REGISTER_TIMEOUT_FIRMWARE       1000
 
 /*
@@ -95,7 +95,7 @@ int rt2x00usb_vendor_request(const struct rt2x00_dev *rt2x00dev,
                              const u8 request, const u8 requesttype,
                              const u16 offset, const u16 value,
                              void *buffer, const u16 buffer_length,
-                             u16 timeout);
+                             const int timeout);
 
 /*
  * Used to read/write from/to the device.
@@ -110,7 +110,7 @@ int rt2x00usb_vendor_request(const struct rt2x00_dev *rt2x00dev,
 int rt2x00usb_vendor_request_buff(const struct rt2x00_dev *rt2x00dev,
                                   const u8 request, const u8 requesttype,
                                   const u16 offset, void *buffer,
-                                  const u16 buffer_length, u16 timeout);
+                                  const u16 buffer_length, const int timeout);
 
 /*
  * Simple wrapper around rt2x00usb_vendor_request to write a single
@@ -122,7 +122,7 @@ static inline int rt2x00usb_vendor_request_sw(const struct rt2x00_dev
                                               const u8 request,
                                               const u16 offset,
                                               const u16 value,
-                                              int timeout)
+                                              const int timeout)
 {
         return rt2x00usb_vendor_request(rt2x00dev, request,
                                         USB_VENDOR_REQUEST_OUT, offset,