lkml.org 
[lkml]   [2013]   [Jul]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[075/141] USB: iuu_phoenix: fix bulk-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 6c13ff68a7ce01da7a51b44241a7aad8eaaedde7 ]

    The bulk-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/iuu_phoenix.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/usb/serial/iuu_phoenix.c b/drivers/usb/serial/iuu_phoenix.c
    index 8d3692b..ae30f2c 100644
    --- a/drivers/usb/serial/iuu_phoenix.c
    +++ b/drivers/usb/serial/iuu_phoenix.c
    @@ -311,7 +311,7 @@ static int bulk_immediate(struct usb_serial_port *port, u8 *buf, u8 count)
    usb_bulk_msg(serial->dev,
    usb_sndbulkpipe(serial->dev,
    port->bulk_out_endpointAddress), buf,
    - count, &actual, HZ * 1);
    + count, &actual, 1000);

    if (status != IUU_OPERATION_OK)
    dbg("%s - error = %2x", __func__, status);
    @@ -331,7 +331,7 @@ static int read_immediate(struct usb_serial_port *port, u8 *buf, u8 count)
    usb_bulk_msg(serial->dev,
    usb_rcvbulkpipe(serial->dev,
    port->bulk_in_endpointAddress), buf,
    - count, &actual, HZ * 1);
    + count, &actual, 1000);

    if (status != IUU_OPERATION_OK)
    dbg("%s - error = %2x", __func__, status);
    --
    1.7.10.4



    \
     
     \ /
      Last update: 2013-07-03 22:01    [W:7.242 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site