aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/serial
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-06-08 14:26:28 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-06-08 14:26:28 -0400
commit2d8d24935d372175786ebefa8a2de8680831b67f (patch)
tree9969683b85f94b59e58bdc1a42e543be62029cb1 /drivers/serial
parentc0683039207226afcffbe0fbf6a1caaee77a37b0 (diff)
parenta0895162fbc1a4168c8cf29e1eb1bbc8c260a80a (diff)
Merge branch 'mxc-master' of git://git.pengutronix.de/git/imx/linux-2.6 into devel
Diffstat (limited to 'drivers/serial')
-rw-r--r--drivers/serial/imx.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c
index 3f5d5a200481..738c8a5f64f2 100644
--- a/drivers/serial/imx.c
+++ b/drivers/serial/imx.c
@@ -1024,6 +1024,8 @@ imx_console_setup(struct console *co, char *options)
1024 if (co->index == -1 || co->index >= ARRAY_SIZE(imx_ports)) 1024 if (co->index == -1 || co->index >= ARRAY_SIZE(imx_ports))
1025 co->index = 0; 1025 co->index = 0;
1026 sport = imx_ports[co->index]; 1026 sport = imx_ports[co->index];
1027 if(sport == NULL)
1028 return -ENODEV;
1027 1029
1028 if (options) 1030 if (options)
1029 uart_parse_options(options, &baud, &parity, &bits, &flow); 1031 uart_parse_options(options, &baud, &parity, &bits, &flow);