diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-06-11 17:55:42 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-06-11 17:55:42 +0200 |
| commit | 940010c5a314a7bd9b498593bc6ba1718ac5aec5 (patch) | |
| tree | d141e08ced08c40c6a8e3ab2cdecde5ff14e560f /drivers/serial | |
| parent | 8dc8e5e8bc0ce00b0f656bf972f67cd8a72759e5 (diff) | |
| parent | 991ec02cdca33b03a132a0cacfe6f0aa0be9aa8d (diff) | |
| download | linux-940010c5a314a7bd9b498593bc6ba1718ac5aec5.tar.bz2 | |
Merge branch 'linus' into perfcounters/core
Conflicts:
arch/x86/kernel/irqinit.c
arch/x86/kernel/irqinit_64.c
arch/x86/kernel/traps.c
arch/x86/mm/fault.c
include/linux/sched.h
kernel/exit.c
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 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); |