aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2013-05-27 14:44:41 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-06-13 09:25:02 -0700
commitb40e7b1ead426706d4ca3193b484cec5df215106 (patch)
tree5b03d8ba9748cdba7429d7cf7edf6cae31b928fd
parenteedbcc70f665c043b7094b17092f6fc99c084c7f (diff)
downloadkernel_samsung_aries-b40e7b1ead426706d4ca3193b484cec5df215106.zip
kernel_samsung_aries-b40e7b1ead426706d4ca3193b484cec5df215106.tar.gz
kernel_samsung_aries-b40e7b1ead426706d4ca3193b484cec5df215106.tar.bz2
USB: ark3116: fix control-message timeout
commit 634371911730a462626071065b64cd6e1fe213e0 upstream. The control-message timeout is specified in milliseconds and should not depend on HZ. Signed-off-by: Johan Hovold <jhovold@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/serial/ark3116.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/serial/ark3116.c b/drivers/usb/serial/ark3116.c
index 18e875b..5cc633e 100644
--- a/drivers/usb/serial/ark3116.c
+++ b/drivers/usb/serial/ark3116.c
@@ -49,7 +49,7 @@ static int debug;
#define DRIVER_NAME "ark3116"
/* usb timeout of 1 second */
-#define ARK_TIMEOUT (1*HZ)
+#define ARK_TIMEOUT 1000
static const struct usb_device_id id_table[] = {
{ USB_DEVICE(0x6547, 0x0232) },