diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-06-08 19:26:28 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-06-08 19:26:28 +0100 |
commit | 2d8d24935d372175786ebefa8a2de8680831b67f (patch) | |
tree | 9969683b85f94b59e58bdc1a42e543be62029cb1 /drivers/serial | |
parent | c0683039207226afcffbe0fbf6a1caaee77a37b0 (diff) | |
parent | a0895162fbc1a4168c8cf29e1eb1bbc8c260a80a (diff) | |
download | linux-stable-2d8d24935d372175786ebefa8a2de8680831b67f.tar.gz linux-stable-2d8d24935d372175786ebefa8a2de8680831b67f.tar.bz2 linux-stable-2d8d24935d372175786ebefa8a2de8680831b67f.zip |
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.c | 2 |
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) 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); |