diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-08 17:29:31 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-08 17:29:31 +0200 |
| commit | 6025974bab1c3da8662df79bdeb694588bc3eb93 (patch) | |
| tree | 27a8fbd7544f7ddcedee541954ab2af04338db4a /drivers | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drz... (diff) | |
| parent | [ARM] 5543/1: arm: serial amba: add missing declaration in serial.h (diff) | |
| download | linux-6025974bab1c3da8662df79bdeb694588bc3eb93.tar.xz linux-6025974bab1c3da8662df79bdeb694588bc3eb93.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 5543/1: arm: serial amba: add missing declaration in serial.h
[ARM] pxa: fix pxa27x_udc default pullup GPIO
[ARM] pxa/imote2: fix UCAM sensor board ADC model number
mx[23]: don't put clock lookups in __initdata
fix oops when using console=ttymxcN with N > 0
[ARM] ARMv7 errata: only apply fixes when running on applicable CPU
[ARM] 5534/1: kmalloc must return a cache line aligned buffer
Diffstat (limited to 'drivers')
| -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 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); |