This is a note to let you know that I've just added the patch titled USB: mos7720: fix message timeouts to the 3.4-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: usb-mos7720-fix-message-timeouts.patch and it can be found in the queue-3.4 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From 849513a7809175420d353625b6f651d961e99d49 Mon Sep 17 00:00:00 2001 From: Johan Hovold <jhovold@xxxxxxxxx> Date: Mon, 27 May 2013 14:44:43 +0200 Subject: USB: mos7720: fix message timeouts From: Johan Hovold <jhovold@xxxxxxxxx> commit 849513a7809175420d353625b6f651d961e99d49 upstream. The control and bulk-message timeouts are specified in milliseconds and should not depend on HZ. Signed-off-by: Johan Hovold <jhovold@xxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/usb/serial/mos7720.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/drivers/usb/serial/mos7720.c +++ b/drivers/usb/serial/mos7720.c @@ -44,7 +44,7 @@ #define DRIVER_DESC "Moschip USB Serial Driver" /* default urb timeout */ -#define MOS_WDR_TIMEOUT (HZ * 5) +#define MOS_WDR_TIMEOUT 5000 #define MOS_MAX_PORT 0x02 #define MOS_WRITE 0x0E @@ -2105,7 +2105,7 @@ static int mos7720_startup(struct usb_se /* setting configuration feature to one */ usb_control_msg(serial->dev, usb_sndctrlpipe(serial->dev, 0), - (__u8)0x03, 0x00, 0x01, 0x00, NULL, 0x00, 5*HZ); + (__u8)0x03, 0x00, 0x01, 0x00, NULL, 0x00, 5000); /* start the interrupt urb */ ret_val = usb_submit_urb(serial->port[0]->interrupt_in_urb, GFP_KERNEL); @@ -2150,7 +2150,7 @@ static void mos7720_release(struct usb_s /* wait for synchronous usb calls to return */ if (mos_parport->msg_pending) wait_for_completion_timeout(&mos_parport->syncmsg_compl, - MOS_WDR_TIMEOUT); + msecs_to_jiffies(MOS_WDR_TIMEOUT)); parport_remove_port(mos_parport->pp); usb_set_serial_data(serial, NULL); Patches currently in stable-queue which might be from jhovold@xxxxxxxxx are queue-3.4/usb-serial-fix-treo-kyocera-interrrupt-in-urb-context.patch queue-3.4/usb-mos7720-fix-dma-to-stack.patch queue-3.4/usb-iuu_phoenix-fix-bulk-message-timeout.patch queue-3.4/usb-whiteheat-fix-broken-port-configuration.patch queue-3.4/usb-mos7720-fix-hardware-flow-control.patch queue-3.4/usb-keyspan-fix-bogus-array-index.patch queue-3.4/usb-ark3116-fix-control-message-timeout.patch queue-3.4/usb-mos7720-fix-message-timeouts.patch queue-3.4/usb-visor-fix-initialisation-of-treo-kyocera-devices.patch -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html