From 9badf7b5f20b98a92057beb06e12aa24ed0ee4f1 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: [PATCH] --- yaml --- r: 149173 b: refs/heads/master c:
 0003b795c310da83501fcf0329f6be7a0984647d h: refs/heads/master i:   149171:
 56ad6e85ac5383db1157fbf4bf43550fdc6fef60 v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/serial/imx.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 471b0c663c9e..f1e8bd4b68ee 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b0c3677bfcf0c21bcaf2130e6e094a92ab93ae8
+refs/heads/master: 0003b795c310da83501fcf0329f6be7a0984647d
diff --git a/trunk/drivers/serial/imx.c b/trunk/drivers/serial/imx.c
index 3f5d5a200481..738c8a5f64f2 100644
--- a/trunk/drivers/serial/imx.c
+++ b/trunk/drivers/serial/imx.c
@@ -1024,6 +1024,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);