Commit 136debf7 authored Mar 11, 2015 by Thomas Betker Committed by Greg Kroah-Hartman Mar 26, 2015

serial: xuartps: Fix check in console_setup().



cdns_uart_console_setup() checks port->mapbase != 0, but the port may
not be initialized yet even if this condition is met [e.g., ioremap()
may have failed]. Check port->membase != NULL instead, similar to
cdns_early_console_setup().

Signed-off-by: Thomas Betker <thomas.betker@rohde-schwarz.com>
Reviewed-by: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 19f22efd

drivers/tty/serial/xilinx_uartps.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1155,7 +1155,7 @@ static int __init cdns_uart_console_setup(struct console co, char options)
		if (co->index < 0 \|\| co->index >= CDNS_UART_NR_PORTS)
		return -EINVAL;

		if (!port->mapbase) {
		if (!port->membase) {
		pr_debug("console on " CDNS_UART_TTY_NAME "%i not present\n",
		co->index);
		return -ENODEV;