Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

serial: core: Cleanup uart_open() exit

Browse source 
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>
This commit is contained in:
Peter Hurley 2016-01-10 20:23:59 -08:00 committed by Greg Kroah-Hartman
parent 35373abbce
commit f9d1083da0
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/tty/serial/serial_core.c
View file

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