diff options
author | Thomas Betker <thomas.betker@rohde-schwarz.com> | 2015-03-11 17:39:27 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-26 17:52:30 -0400 |
commit | 0c39a467e7ba68a0d94439c1ebe260dc5b26302b (patch) | |
tree | fa67413d5f223342b3e86c9847899d9b1d35380e /drivers/tty | |
parent | 6db6df0e4a1b913810fc9063bbb332476ce316b7 (diff) |
serial: xuartps: Fix iobase use.
cdns_uart_get_port() sets port->iobase = 1 to "mark port in use", but
this "in use" condition is not checked anywhere else in the code. So
remove the line, keeping port->iobase = 0 (which also makes more sense).
Signed-off-by: Thomas Betker <thomas.betker@rohde-schwarz.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r-- | drivers/tty/serial/xilinx_uartps.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c index b0c2862a3daf..50643a94c5c1 100644 --- a/drivers/tty/serial/xilinx_uartps.c +++ b/drivers/tty/serial/xilinx_uartps.c | |||
@@ -1038,7 +1038,6 @@ static struct uart_port *cdns_uart_get_port(int id) | |||
1038 | /* At this point, we've got an empty uart_port struct, initialize it */ | 1038 | /* At this point, we've got an empty uart_port struct, initialize it */ |
1039 | spin_lock_init(&port->lock); | 1039 | spin_lock_init(&port->lock); |
1040 | port->membase = NULL; | 1040 | port->membase = NULL; |
1041 | port->iobase = 1; /* mark port in use */ | ||
1042 | port->irq = 0; | 1041 | port->irq = 0; |
1043 | port->type = PORT_UNKNOWN; | 1042 | port->type = PORT_UNKNOWN; |
1044 | port->iotype = UPIO_MEM32; | 1043 | port->iotype = UPIO_MEM32; |