From: Thomas Betker <thomas.betker@rohde-schwarz.com>
Date: Wed, 11 Mar 2015 21:39:28 +0000 (+0100)
Subject: serial: xuartps: Fix check in console_setup().
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=136debf707d2b3cd8e74d0fff8e29d11a78bf5c2;p=linux-beck.git

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

diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c
index 556062a438cf..f218ec658f5d 100644
--- a/drivers/tty/serial/xilinx_uartps.c
+++ b/drivers/tty/serial/xilinx_uartps.c
@@ -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;