]> Git Repo - linux.git/commitdiff
staging: fwserial: fix TIOCSSERIAL jiffies conversions
authorJohan Hovold <[email protected]>
Wed, 7 Apr 2021 10:23:19 +0000 (12:23 +0200)
committerGreg Kroah-Hartman <[email protected]>
Wed, 7 Apr 2021 15:22:06 +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.

Fixes: 7355ba3445f2 ("staging: fwserial: Add TTY-over-Firewire serial driver")
Cc: [email protected] # 3.8
Signed-off-by: Johan Hovold <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>
drivers/staging/fwserial/fwserial.c

index c368082aae1aa87b33605587788f0ee2f608522e..c963848522b1562b1461c20e0832095d60339de3 100644 (file)
@@ -1223,7 +1223,7 @@ static int get_serial_info(struct tty_struct *tty,
        ss->flags = port->port.flags;
        ss->xmit_fifo_size = FWTTY_PORT_TXFIFO_LEN;
        ss->baud_base = 400000000;
-       ss->close_delay = port->port.close_delay;
+       ss->close_delay = jiffies_to_msecs(port->port.close_delay) / 10;
        mutex_unlock(&port->port.mutex);
        return 0;
 }
@@ -1245,7 +1245,7 @@ static int set_serial_info(struct tty_struct *tty,
                        return -EPERM;
                }
        }
-       port->port.close_delay = ss->close_delay * HZ / 100;
+       port->port.close_delay = msecs_to_jiffies(ss->close_delay * 10);
        mutex_unlock(&port->port.mutex);
 
        return 0;
This page took 0.085883 seconds and 4 git commands to generate.