]> Git Repo - linux.git/commitdiff
tty: moxa: fix TIOCSSERIAL jiffies conversions
authorJohan Hovold <[email protected]>
Wed, 7 Apr 2021 10:23:28 +0000 (12:23 +0200)
committerGreg Kroah-Hartman <[email protected]>
Wed, 7 Apr 2021 15:22:07 +0000 (17:22 +0200)
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: [email protected]
Signed-off-by: Johan Hovold <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>
drivers/tty/moxa.c

index 32eb6b5e510f059cb20763883d25ea85b4d9642c..5b7bc7af8b1e05312761daeccabc50c9a6d34d54 100644 (file)
@@ -2038,7 +2038,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;
 }
@@ -2067,7 +2067,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);
 
This page took 0.056307 seconds and 4 git commands to generate.