projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'drm-sti-next-add-dvo' of git://git.linaro.org/people/benjamin.gaignard...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
tty
/
goldfish.c
diff --git
a/drivers/tty/goldfish.c
b/drivers/tty/goldfish.c
index 09495f515fa97805fb84d8c1362902f6255d0187..967b2c2b7cf1063e6d638dcb2e7b3b3b9bde37f0 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)
{
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;
return -ENODEV;
- if (
goldfish_ttys[co->index].base == 0
)
+ if (
!goldfish_ttys[co->index].base
)
return -ENODEV;
return 0;
}
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);
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)
free_irq(qtty->irq, pdev);
goldfish_tty_current_line_count--;
if (goldfish_tty_current_line_count == 0)