Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[firefly-linux-kernel-4.4.55.git] / drivers / tty / goldfish.c

diff --git a/drivers/tty/goldfish.c b/drivers/tty/goldfish.c
index d6e332cba3ea714c558f7c72a0afdbca954789dc..0655fecf8240593cd53a312c535e5f7296f5c280 100644 (file)
--- a/drivers/tty/goldfish.c
+++ b/drivers/tty/goldfish.c
@@ -155,9 +155,9 @@ static struct tty_driver *goldfish_tty_console_device(struct console *c,
 
 static int goldfish_tty_console_setup(struct console *co, char *options)
 {
-       if ((unsigned)co->index > goldfish_tty_line_count)
+       if ((unsigned)co->index >= goldfish_tty_line_count)
                return -ENODEV;
-       if (goldfish_ttys[co->index].base == 0)
+       if (!goldfish_ttys[co->index].base)
                return -ENODEV;
        return 0;
 }
@@ -315,7 +315,7 @@ static int goldfish_tty_remove(struct platform_device *pdev)
        unregister_console(&qtty->console);
        tty_unregister_device(goldfish_tty_driver, pdev->id);
        iounmap(qtty->base);
-       qtty->base = 0;
+       qtty->base = NULL;
        free_irq(qtty->irq, pdev);
        goldfish_tty_current_line_count--;
        if (goldfish_tty_current_line_count == 0)