summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuss Dill <Russ.Dill@asu.edu>2008-01-16 01:13:56 +0200
committerAdrian Bunk <bunk@kernel.org>2008-01-16 01:13:56 +0200
commit2f248cf37ebe3cf9892905a5356f6f031751a477 (patch)
tree0781e824b3d924e0118d8590d84efbc6d623ebf1
parent3902b59254456107f77820ad42c7f27640f648e9 (diff)
[NET] kaweth was forgotten in msec switchover of usb_start_wait_urb
Back in 2.6.12-pre, usb_start_wait_urb was switched over to take milliseconds instead of jiffies. kaweth.c was never updated to match. Signed-off-by: Russ Dill <Russ.Dill@asu.edu> Signed-off-by: Adrian Bunk <bunk@kernel.org>
-rw-r--r--drivers/usb/net/kaweth.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/net/kaweth.c b/drivers/usb/net/kaweth.c
index def3bb8e2290..71e77b5fdec4 100644
--- a/drivers/usb/net/kaweth.c
+++ b/drivers/usb/net/kaweth.c
@@ -82,7 +82,7 @@
#define KAWETH_TX_TIMEOUT (5 * HZ)
#define KAWETH_SCRATCH_SIZE 32
#define KAWETH_FIRMWARE_BUF_SIZE 4096
-#define KAWETH_CONTROL_TIMEOUT (30 * HZ)
+#define KAWETH_CONTROL_TIMEOUT (30000)
#define KAWETH_STATUS_BROKEN 0x0000001
#define KAWETH_STATUS_CLOSING 0x0000002