lkml.org 
[lkml]   [2021]   [May]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 009/530] USB: serial: usb_wwan: fix TIOCSSERIAL jiffies conversions
    Date
    From: Johan Hovold <johan@kernel.org>

    commit 3d732690d2267f4d0e19077b178dffbedafdf0c9 upstream.

    The port close_delay and closing_wait parameters set by TIOCSSERIAL are
    specified in jiffies and not milliseconds.

    Add the missing conversions so that the TIOCSSERIAL works as expected
    also when HZ is not 1000.

    Fixes: 02303f73373a ("usb-wwan: implement TIOCGSERIAL and TIOCSSERIAL to avoid blocking close(2)")
    Cc: stable@vger.kernel.org # 2.6.38
    Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Johan Hovold <johan@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/usb/serial/usb_wwan.c | 9 +++++----
    1 file changed, 5 insertions(+), 4 deletions(-)

    --- a/drivers/usb/serial/usb_wwan.c
    +++ b/drivers/usb/serial/usb_wwan.c
    @@ -140,10 +140,10 @@ int usb_wwan_get_serial_info(struct tty_
    ss->line = port->minor;
    ss->port = port->port_number;
    ss->baud_base = tty_get_baud_rate(port->port.tty);
    - ss->close_delay = port->port.close_delay / 10;
    + ss->close_delay = jiffies_to_msecs(port->port.close_delay) / 10;
    ss->closing_wait = port->port.closing_wait == ASYNC_CLOSING_WAIT_NONE ?
    ASYNC_CLOSING_WAIT_NONE :
    - port->port.closing_wait / 10;
    + jiffies_to_msecs(port->port.closing_wait) / 10;
    return 0;
    }
    EXPORT_SYMBOL(usb_wwan_get_serial_info);
    @@ -155,9 +155,10 @@ int usb_wwan_set_serial_info(struct tty_
    unsigned int closing_wait, close_delay;
    int retval = 0;

    - close_delay = ss->close_delay * 10;
    + close_delay = msecs_to_jiffies(ss->close_delay * 10);
    closing_wait = ss->closing_wait == ASYNC_CLOSING_WAIT_NONE ?
    - ASYNC_CLOSING_WAIT_NONE : ss->closing_wait * 10;
    + ASYNC_CLOSING_WAIT_NONE :
    + msecs_to_jiffies(ss->closing_wait * 10);

    mutex_lock(&port->port.mutex);


    \
     
     \ /
      Last update: 2021-05-12 17:31    [W:4.359 / U:0.160 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site