diff --git a/[refs] b/[refs]
index afc5ca023ca4..046318c6f980 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f023eab379821365bf265a0240f30c00cecaef7c
+refs/heads/master: 2314a0f667352748a48753bf903f8c50fd2a756d
diff --git a/trunk/drivers/tty/serial/altera_jtaguart.c b/trunk/drivers/tty/serial/altera_jtaguart.c
index f9b49b5ff5e1..0c0a8b60f2d6 100644
--- a/trunk/drivers/tty/serial/altera_jtaguart.c
+++ b/trunk/drivers/tty/serial/altera_jtaguart.c
@@ -384,7 +384,7 @@ static int __init altera_jtaguart_console_setup(struct console *co,
 	if (co->index < 0 || co->index >= ALTERA_JTAGUART_MAXPORTS)
 		return -EINVAL;
 	port = &altera_jtaguart_ports[co->index].port;
-	if (port->membase == 0)
+	if (port->membase == NULL)
 		return -ENODEV;
 	return 0;
 }