From: Peter Hurley <peter@hurleysoftware.com>
Date: Mon, 11 Jan 2016 04:23:59 +0000 (-0800)
Subject: serial: core: Cleanup uart_open() exit
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f9d1083da00514ef36a06e915f32b7304ae5b5bd;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

serial: core: Cleanup uart_open() exit

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index 1e7430c60ee6..5cf069756497 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)