diff options
| author | Alex Shi <alex.shi@linaro.org> | 2014-01-10 10:50:57 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2014-01-10 10:50:57 +0800 |
| commit | 450cdfa9c5713551ab1438ab210679868b52a994 (patch) | |
| tree | edd98f9698aa88af55a3a1ee3de62e52917c39ba /drivers/tty/serial/pmac_zilog.c | |
| parent | bf78886fb6c4131885f84f3eaaf7474509d40e51 (diff) | |
| parent | 8b4ed85b8404ffe7e10ee410c4df3968b86f0793 (diff) | |
Merge remote-tracking branch 'stable/linux-3.10.y' into linux-linaro-lsk
Conflicts:
arch/arm64/kernel/smp.c
Signed-off-by: Alex Shi <alex.shi@linaro.org>
Diffstat (limited to 'drivers/tty/serial/pmac_zilog.c')
| -rw-r--r-- | drivers/tty/serial/pmac_zilog.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/tty/serial/pmac_zilog.c b/drivers/tty/serial/pmac_zilog.c index b1785f58b6e..7735bbdccbc 100644 --- a/drivers/tty/serial/pmac_zilog.c +++ b/drivers/tty/serial/pmac_zilog.c @@ -2051,6 +2051,9 @@ static int __init pmz_console_init(void) /* Probe ports */ pmz_probe(); + if (pmz_ports_count == 0) + return -ENODEV; + /* TODO: Autoprobe console based on OF */ /* pmz_console.index = i; */ register_console(&pmz_console); |