From: Jiri Slaby Date: Thu, 18 Nov 2021 07:31:18 +0000 (+0100) Subject: mxser: use msleep_interruptible() in mxser_wait_until_sent() X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=fe74bc619b0db23c4b513141acd3e3e45694bb08;p=linux.git mxser: use msleep_interruptible() in mxser_wait_until_sent() Instead of schedule_timeout_interruptible(), because: 1) we don't have to bother with the task state, and 2) msleep* guarantees to sleep that time (if not interrupted). Signed-off-by: Jiri Slaby Link: https://lore.kernel.org/r/20211118073125.12283-13-jslaby@suse.cz Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/tty/mxser.c b/drivers/tty/mxser.c index fb26670b5a0bf..b3ae3b105af06 100644 --- a/drivers/tty/mxser.c +++ b/drivers/tty/mxser.c @@ -1443,6 +1443,9 @@ static void mxser_wait_until_sent(struct tty_struct *tty, int timeout) char_time = 1; if (timeout && timeout < char_time) char_time = timeout; + + char_time = jiffies_to_msecs(char_time); + /* * If the transmitter hasn't cleared in twice the approximate * amount of time to send the entire FIFO, it probably won't @@ -1456,13 +1459,12 @@ static void mxser_wait_until_sent(struct tty_struct *tty, int timeout) timeout = 2 * info->timeout; while (mxser_tx_empty(info)) { - schedule_timeout_interruptible(char_time); + msleep_interruptible(char_time); if (signal_pending(current)) break; if (timeout && time_after(jiffies, orig_jiffies + timeout)) break; } - set_current_state(TASK_RUNNING); } /*