]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
USB: ark3116: fix control-message timeout
authorJohan Hovold <jhovold@gmail.com>
Mon, 27 May 2013 12:44:41 +0000 (14:44 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 13 Jun 2013 16:25:02 +0000 (09:25 -0700)
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>
drivers/usb/serial/ark3116.c

index 18e875b92e001d1c290f2b95e498eea77c6b72cb..5cc633efddfe425d6b9975440595e4bdc11432bf 100644 (file)
@@ -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) },