diff options
author | Inaky Perez-Gonzalez <inaky@linux.intel.com> | 2009-10-19 22:09:25 -0400 |
---|---|---|
committer | Inaky Perez-Gonzalez <inaky@linux.intel.com> | 2009-11-03 15:49:37 -0500 |
commit | 296bd4bdd0a43c5e56ee310bcb9b4722e5d52db8 (patch) | |
tree | b28697a4970d95b6605e5c2b92e18fe7208573f0 /drivers/net/wimax/i2400m/usb-fw.c | |
parent | 5ab5a7215a0cfd40572a9f09276ebcb071ee6fb7 (diff) |
wimax/i2400m: Fix USB timeout specifications (to ms from HZ)
The USB code was incorrectly specifiying timeouts to be in jiffies vs
msecs. On top of that, lower it to 200ms, as 1s is really too long
(doesn't allow the watchdog to trip a reset if the device timesout too
often).
Signed-off-by: Inaky Perez-Gonzalez <inaky@linux.intel.com>
Diffstat (limited to 'drivers/net/wimax/i2400m/usb-fw.c')
-rw-r--r-- | drivers/net/wimax/i2400m/usb-fw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wimax/i2400m/usb-fw.c b/drivers/net/wimax/i2400m/usb-fw.c index b59aee0ee649..8ec8b6d56a13 100644 --- a/drivers/net/wimax/i2400m/usb-fw.c +++ b/drivers/net/wimax/i2400m/usb-fw.c | |||
@@ -102,7 +102,7 @@ ssize_t i2400mu_tx_bulk_out(struct i2400mu *i2400mu, void *buf, size_t buf_size) | |||
102 | epd = usb_get_epd(i2400mu->usb_iface, i2400mu->endpoint_cfg.bulk_out); | 102 | epd = usb_get_epd(i2400mu->usb_iface, i2400mu->endpoint_cfg.bulk_out); |
103 | pipe = usb_sndbulkpipe(i2400mu->usb_dev, epd->bEndpointAddress); | 103 | pipe = usb_sndbulkpipe(i2400mu->usb_dev, epd->bEndpointAddress); |
104 | retry: | 104 | retry: |
105 | result = usb_bulk_msg(i2400mu->usb_dev, pipe, buf, buf_size, &len, HZ); | 105 | result = usb_bulk_msg(i2400mu->usb_dev, pipe, buf, buf_size, &len, 200); |
106 | switch (result) { | 106 | switch (result) { |
107 | case 0: | 107 | case 0: |
108 | if (len != buf_size) { | 108 | if (len != buf_size) { |