| From 6e70b73ca5240c0059a1fbf8ccd4276d6cf71956 Mon Sep 17 00:00:00 2001 |
| From: Johan Hovold <johan@kernel.org> |
| Date: Wed, 7 Apr 2021 12:23:28 +0200 |
| Subject: tty: moxa: fix TIOCSSERIAL jiffies conversions |
| |
| From: Johan Hovold <johan@kernel.org> |
| |
| 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> |
| --- |
| drivers/tty/moxa.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/tty/moxa.c |
| +++ b/drivers/tty/moxa.c |
| @@ -2040,7 +2040,7 @@ static int moxa_get_serial_info(struct t |
| 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 t |
| 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); |
| |