lkml.org 
[lkml]   [2013]   [Jun]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 17/93] USB: mos7720: fix message timeouts
    Date
    3.5.7.15 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Johan Hovold <jhovold@gmail.com>

    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@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/usb/serial/mos7720.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c
    index 52b3342..bd42c97 100644
    --- 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
    @@ -2099,7 +2099,7 @@ static int mos7720_startup(struct usb_serial *serial)

    /* 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);
    @@ -2144,7 +2144,7 @@ static void mos7720_release(struct usb_serial *serial)
    /* 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);
    --
    1.8.1.2


    \
     
     \ /
      Last update: 2013-06-18 17:41    [W:2.651 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site