]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
tty: moxa: fix TIOCSSERIAL jiffies conversions
authorJohan Hovold <johan@kernel.org>
Wed, 7 Apr 2021 10:23:28 +0000 (12:23 +0200)
committerKleber Sacilotto de Souza <kleber.souza@canonical.com>
Wed, 26 May 2021 13:39:02 +0000 (15:39 +0200)
BugLink: https://bugs.launchpad.net/bugs/1929615
commit 6e70b73ca5240c0059a1fbf8ccd4276d6cf71956 upstream.

The port close_delay parameter set by TIOCSSERIAL is specified in
jiffies, while the value returned by TIOCGSERIAL is specified in
centiseconds.

Add the missing conversions so that TIOCGSERIAL works as expected also
when HZ is not 100.

Cc: stable@vger.kernel.org
Signed-off-by: Johan Hovold <johan@kernel.org>
Link: https://lore.kernel.org/r/20210407102334.32361-11-johan@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
drivers/tty/moxa.c

index 3a1a5e0ee93f1d4bd4738fdade69b791376e6851..5fe0ca1457ca18cd53f5670b1aa0329623e960d9 100644 (file)
@@ -2040,7 +2040,7 @@ static int moxa_get_serial_info(struct tty_struct *tty,
        ss->line = info->port.tty->index,
        ss->flags = info->port.flags,
        ss->baud_base = 921600,
-       ss->close_delay = info->port.close_delay;
+       ss->close_delay = jiffies_to_msecs(info->port.close_delay) / 10;
        mutex_unlock(&info->port.mutex);
        return 0;
 }
@@ -2069,7 +2069,7 @@ static int moxa_set_serial_info(struct tty_struct *tty,
                        return -EPERM;
                }
        }
-       info->port.close_delay = ss->close_delay * HZ / 100;
+       info->port.close_delay = msecs_to_jiffies(ss->close_delay * 10);
 
        MoxaSetFifo(info, ss->type == PORT_16550A);