Commit 4ae8aeae authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

newport_con warning fix

drivers/video/console/newport_con.c: In function `newport_console_init':
drivers/video/console/newport_con.c:743: warning: return makes integer from pointer without a cast

Although one wonders whether that should have been -ENODEV...

Cc: "Antonino A. Daplas" <adaplas@pol.net>
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0aa42632
...@@ -738,9 +738,8 @@ const struct consw newport_con = { ...@@ -738,9 +738,8 @@ const struct consw newport_con = {
#ifdef MODULE #ifdef MODULE
static int __init newport_console_init(void) static int __init newport_console_init(void)
{ {
if (!sgi_gfxaddr) if (!sgi_gfxaddr)
return NULL; return 0;
if (!npregs) if (!npregs)
npregs = (struct newport_regs *)/* ioremap cannot fail */ npregs = (struct newport_regs *)/* ioremap cannot fail */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment