Commit f9d1083d authored by Peter Hurley's avatar Peter Hurley Committed by Greg Kroah-Hartman
Browse files

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: default avatarPeter Hurley <peter@hurleysoftware.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 35373abb
...@@ -1622,15 +1622,12 @@ static int uart_open(struct tty_struct *tty, struct file *filp) ...@@ -1622,15 +1622,12 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
/* /*
* If we succeeded, wait until the port is ready. * If we succeeded, wait until the port is ready.
*/ */
err_unlock:
mutex_unlock(&port->mutex); mutex_unlock(&port->mutex);
if (retval == 0) if (retval == 0)
retval = tty_port_block_til_ready(port, tty, filp); retval = tty_port_block_til_ready(port, tty, filp);
end: end:
return retval; return retval;
err_unlock:
mutex_unlock(&port->mutex);
goto end;
} }
static const char *uart_type(struct uart_port *port) static const char *uart_type(struct uart_port *port)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment