From e76afc4e7816a0a5300073098cdac93a994eb5ca Mon Sep 17 00:00:00 2001
From: Eric Lammerts <linux-arm@lists.lammerts.org>
Date: Tue, 19 May 2009 20:53:20 -0400
Subject: fix oops when using console=ttymxcN with N > 0

Signed-off-by: Eric Lammerts <eric@lammerts.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 drivers/serial/imx.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'drivers/serial/imx.c')

diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c
index 9f460b175c50..5f0be40dfdab 100644
--- a/drivers/serial/imx.c
+++ b/drivers/serial/imx.c
@@ -1031,6 +1031,8 @@ imx_console_setup(struct console *co, char *options)
 	if (co->index == -1 || co->index >= ARRAY_SIZE(imx_ports))
 		co->index = 0;
 	sport = imx_ports[co->index];
+	if(sport == NULL)
+		return -ENODEV;
 
 	if (options)
 		uart_parse_options(options, &baud, &parity, &bits, &flow);
-- 
cgit v1.2.3