diff options
| author | Stanislaw Gruszka <sgruszka@redhat.com> | 2014-11-26 15:29:13 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-12-01 21:57:20 +0100 |
| commit | ad92bc9e8e62b9dd013f8afa7497e916f8de0364 (patch) | |
| tree | 82ca1307e9746c8b41e1a18eb2c1f810504d55d6 | |
| parent | brcmsmac: extend hardware info shown in debugfs (diff) | |
| download | linux-ad92bc9e8e62b9dd013f8afa7497e916f8de0364.tar.xz linux-ad92bc9e8e62b9dd013f8afa7497e916f8de0364.zip | |
rt2x00: use timeout in rt2x00usb_vendor_request
Use provided timeout value in rt2x00usb_vendor_request() instead
of iterating REGISTER_BUSY_COUNT times.
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00usb.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.c b/drivers/net/wireless/rt2x00/rt2x00usb.c index dc85d3e0ffe5..258e2a87c5ea 100644 --- a/drivers/net/wireless/rt2x00/rt2x00usb.c +++ b/drivers/net/wireless/rt2x00/rt2x00usb.c @@ -42,31 +42,27 @@ int rt2x00usb_vendor_request(struct rt2x00_dev *rt2x00dev, { struct usb_device *usb_dev = to_usb_device_intf(rt2x00dev->dev); int status; - unsigned int i; unsigned int pipe = (requesttype == USB_VENDOR_REQUEST_IN) ? usb_rcvctrlpipe(usb_dev, 0) : usb_sndctrlpipe(usb_dev, 0); + unsigned long expire = jiffies + msecs_to_jiffies(timeout); if (!test_bit(DEVICE_STATE_PRESENT, &rt2x00dev->flags)) return -ENODEV; - for (i = 0; i < REGISTER_BUSY_COUNT; i++) { + do { status = usb_control_msg(usb_dev, pipe, request, requesttype, value, offset, buffer, buffer_length, - timeout); + timeout / 2); if (status >= 0) return 0; - /* - * Check for errors - * -ENODEV: Device has disappeared, no point continuing. - * All other errors: Try again. - */ - else if (status == -ENODEV) { + if (status == -ENODEV) { + /* Device has disappeared. */ clear_bit(DEVICE_STATE_PRESENT, &rt2x00dev->flags); break; } - } + } while (time_before(jiffies, expire)); /* If the port is powered down, we get a -EPROTO error, and this * leads to a endless loop. So just say that the device is gone. |