diff options
| author | Mark Brown <broonie@linaro.org> | 2013-12-02 13:37:41 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-02 13:37:41 +0000 |
| commit | e80b89ee2ace3a959c44c834231851fc5242eb13 (patch) | |
| tree | ec8cd7a9cd05002261fbfda9b4ea4f66d1e04f7b /drivers/tty/serial/pmac_zilog.c | |
| parent | 85cfe6b64d785b170367322d9d130a530db7b276 (diff) | |
| parent | dc1ccc48159d63eca5089e507c82c7d22ef60839 (diff) | |
Merge tag 'v3.13-rc2' into spi-rcar
Linux 3.13-rc2
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 481b781b26e..e9d420ff393 100644 --- a/drivers/tty/serial/pmac_zilog.c +++ b/drivers/tty/serial/pmac_zilog.c @@ -2052,6 +2052,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); |