Ver código fonte

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>
Peter Hurley 10 anos atrás
pai
commit
f9d1083da0
1 arquivos alterados com 1 adições e 4 exclusões
  1. 1 4
      drivers/tty/serial/serial_core.c

+ 1 - 4
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.
 	 * 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)