diff options
| author | Jiri Slaby (SUSE) <jirislaby@kernel.org> | 2023-09-19 10:51:56 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-01-25 15:35:53 -0800 |
| commit | 2433f050d31acf64fe340e28b0e41390ae871ca2 (patch) | |
| tree | b0f0a9db1d24cf1c4dce7828762ef195252eed8f | |
| parent | eefdb1be0c8be48d260787a0aa404deef790dac9 (diff) | |
| download | linux-rpi-2433f050d31acf64fe340e28b0e41390ae871ca2.tar.gz linux-rpi-2433f050d31acf64fe340e28b0e41390ae871ca2.tar.bz2 linux-rpi-2433f050d31acf64fe340e28b0e41390ae871ca2.zip | |
tty: use 'if' in send_break() instead of 'goto'
[ Upstream commit 24f2cd019946fc2e88e632d2e24a34c2cc3f2be4 ]
Now, the "jumped-over" code is simple enough to be put inside an 'if'.
Do so to make it 'goto'-less.
Signed-off-by: "Jiri Slaby (SUSE)" <jirislaby@kernel.org>
Link: https://lore.kernel.org/r/20230919085156.1578-16-jirislaby@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Stable-dep-of: 66aad7d8d3ec ("usb: cdc-acm: return correct error code on unsupported break")
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/tty/tty_io.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c index ddcaf967f64b..724ebf82f2cd 100644 --- a/drivers/tty/tty_io.c +++ b/drivers/tty/tty_io.c @@ -2482,11 +2482,10 @@ static int send_break(struct tty_struct *tty, unsigned int duration) return -EINTR; retval = tty->ops->break_ctl(tty, -1); - if (retval) - goto out; - msleep_interruptible(duration); - retval = tty->ops->break_ctl(tty, 0); -out: + if (!retval) { + msleep_interruptible(duration); + retval = tty->ops->break_ctl(tty, 0); + } tty_write_unlock(tty); if (signal_pending(current)) |