aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wimax/i2400m/usb.c
diff options
context:
space:
mode:
authorInaky Perez-Gonzalez <inaky@linux.intel.com>2009-10-19 22:09:25 -0400
committerInaky Perez-Gonzalez <inaky@linux.intel.com>2009-11-03 15:49:37 -0500
commit296bd4bdd0a43c5e56ee310bcb9b4722e5d52db8 (patch)
treeb28697a4970d95b6605e5c2b92e18fe7208573f0 /drivers/net/wimax/i2400m/usb.c
parent5ab5a7215a0cfd40572a9f09276ebcb071ee6fb7 (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.c')
-rw-r--r--drivers/net/wimax/i2400m/usb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wimax/i2400m/usb.c b/drivers/net/wimax/i2400m/usb.c
index 5e079408f16e..34df0906caae 100644
--- a/drivers/net/wimax/i2400m/usb.c
+++ b/drivers/net/wimax/i2400m/usb.c
@@ -173,7 +173,7 @@ int __i2400mu_send_barker(struct i2400mu *i2400mu,
173 pipe = usb_sndbulkpipe(i2400mu->usb_dev, epd->bEndpointAddress); 173 pipe = usb_sndbulkpipe(i2400mu->usb_dev, epd->bEndpointAddress);
174 memcpy(buffer, barker, barker_size); 174 memcpy(buffer, barker, barker_size);
175 ret = usb_bulk_msg(i2400mu->usb_dev, pipe, buffer, barker_size, 175 ret = usb_bulk_msg(i2400mu->usb_dev, pipe, buffer, barker_size,
176 &actual_len, HZ); 176 &actual_len, 200);
177 if (ret < 0) { 177 if (ret < 0) {
178 if (ret != -EINVAL) 178 if (ret != -EINVAL)
179 dev_err(dev, "E: barker error: %d\n", ret); 179 dev_err(dev, "E: barker error: %d\n", ret);