From a4dc923640418120fe7bbdfac149397bc761a249 Mon Sep 17 00:00:00 2001 From: Fabian Frederick Date: Sun, 28 Sep 2014 20:10:17 +0200 Subject: goldfish: fix sparse warnings drivers/tty/goldfish.c:160:46: warning: Using plain integer as NULL pointer drivers/tty/goldfish.c:320:22: warning: Using plain integer as NULL pointer Signed-off-by: Fabian Frederick Signed-off-by: Greg Kroah-Hartman --- drivers/tty/goldfish.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/tty/goldfish.c') diff --git a/drivers/tty/goldfish.c b/drivers/tty/goldfish.c index 09495f515fa9..c24b9633ae19 100644 --- a/drivers/tty/goldfish.c +++ b/drivers/tty/goldfish.c @@ -157,7 +157,7 @@ static int goldfish_tty_console_setup(struct console *co, char *options) { 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; } @@ -317,7 +317,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) -- cgit v1.2.3-59-g8ed1b From fda2b418a1945bebd5c8f670768fe75c515816ec Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Wed, 29 Oct 2014 11:43:25 +0300 Subject: goldfish: off by one in goldfish_tty_console_setup() The goldfish_ttys[] array has "goldfish_tty_line_count" number of elements. It's allocated in goldfish_tty_create_driver(). This test should be >= instead of >. Signed-off-by: Dan Carpenter Acked-by: Alan Cox Signed-off-by: Greg Kroah-Hartman --- drivers/tty/goldfish.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/tty/goldfish.c') diff --git a/drivers/tty/goldfish.c b/drivers/tty/goldfish.c index c24b9633ae19..967b2c2b7cf1 100644 --- a/drivers/tty/goldfish.c +++ b/drivers/tty/goldfish.c @@ -155,7 +155,7 @@ 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) return -ENODEV; -- cgit v1.2.3-59-g8ed1b