From: Peter Hurley <peter@hurleysoftware.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jiri Slaby <jslaby@suse.cz>,
linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org,
Peter Hurley <peter@hurleysoftware.com>
Subject: [PATCH v2 5/8] serial: core: Cleanup uart_open() exit
Date: Sun, 10 Jan 2016 20:23:59 -0800 [thread overview]
Message-ID: <1452486242-7297-6-git-send-email-peter@hurleysoftware.com> (raw)
In-Reply-To: <1452486242-7297-1-git-send-email-peter@hurleysoftware.com>
If aborting uart_open() unsuccessfully, retval is non-zero, so the
existing fall-through exit is equivalent.
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
---
drivers/tty/serial/serial_core.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index f8c28a7..f77be14 100644
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -1622,15 +1622,12 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
/*
* If we succeeded, wait until the port is ready.
*/
+err_unlock:
mutex_unlock(&port->mutex);
if (retval == 0)
retval = tty_port_block_til_ready(port, tty, filp);
-
end:
return retval;
-err_unlock:
- mutex_unlock(&port->mutex);
- goto end;
}
static const char *uart_type(struct uart_port *port)
--
2.7.0
next prev parent reply other threads:[~2016-01-11 4:23 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-11 4:23 [PATCH v2 0/8] Misc serial cleanups Peter Hurley
2016-01-11 4:23 ` [PATCH v2 1/8] serial: core: Fold __uart_put_char() into caller Peter Hurley
2016-01-11 4:23 ` [PATCH v2 2/8] serial: core: Fold do_uart_get_info() " Peter Hurley
2016-01-11 4:23 ` [PATCH v2 3/8] serial: core: Use tty->index for port # in debug messages Peter Hurley
2016-01-11 4:23 ` [PATCH v2 4/8] serial: Fix ASYNC_* => UPF_* flags misuse Peter Hurley
2016-01-11 4:23 ` Peter Hurley [this message]
2016-01-11 4:24 ` [PATCH v2 6/8] serial: core: Remove cast from void ptr in uart_open() Peter Hurley
2016-01-11 4:24 ` [PATCH v2 7/8] serial: core: Unfold < 80 char lines Peter Hurley
2016-01-11 4:24 ` [PATCH v2 8/8] serial: core: Perform RTS signalling before soft flow ctrl Peter Hurley
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1452486242-7297-6-git-send-email-peter@hurleysoftware.com \
--to=peter@hurleysoftware.com \
--cc=gregkh@linuxfoundation.org \
--cc=jslaby@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).