diff options
| author | Jiri Slaby <jslaby@suse.cz> | 2021-11-18 08:31:18 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-11-25 18:33:22 +0100 |
| commit | fe74bc619b0db23c4b513141acd3e3e45694bb08 (patch) | |
| tree | 6e390f6bfab97c02758f1708236b23c5278b9a33 /drivers | |
| parent | 239ef19ef040698ccbabf25582b40c43554542fd (diff) | |
| download | linux-fe74bc619b0db23c4b513141acd3e3e45694bb08.tar.gz linux-fe74bc619b0db23c4b513141acd3e3e45694bb08.tar.bz2 linux-fe74bc619b0db23c4b513141acd3e3e45694bb08.zip | |
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 <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20211118073125.12283-13-jslaby@suse.cz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/tty/mxser.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/tty/mxser.c b/drivers/tty/mxser.c index fb26670b5a0b..b3ae3b105af0 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); } /* |