From: Jiri Slaby (SUSE) <jirislaby@kernel.org>
Date: Tue, 19 Sep 2023 08:51:56 +0000 (+0200)
Subject: tty: use 'if' in send_break() instead of 'goto'
X-Git-Tag: v6.6.14~92
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2433f050d31acf64fe340e28b0e41390ae871ca2;p=thirdparty%2Fkernel%2Fstable.git

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>
---

diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index ddcaf967f64b7..724ebf82f2cd9 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))