| Date | Wed, 03 Jul 2013 14:40:14 -0400 | From | Steven Rostedt <> | Subject | [077/141] USB: ark3116: fix control-message timeout |
| |
3.6.11.6 stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <jhovold@gmail.com>
[ Upstream commit 634371911730a462626071065b64cd6e1fe213e0 ]
The control-message timeout is specified in milliseconds and should not depend on HZ.
Cc: stable@vger.kernel.org Signed-off-by: Johan Hovold <jhovold@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Steven Rostedt <rostedt@goodmis.org> --- drivers/usb/serial/ark3116.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/usb/serial/ark3116.c b/drivers/usb/serial/ark3116.c index 5f9eaaf..415c23f 100644 --- a/drivers/usb/serial/ark3116.c +++ b/drivers/usb/serial/ark3116.c @@ -49,7 +49,7 @@ static bool 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) }, -- 1.7.10.4
|