OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] m68k: fix macfb init 

To be used by module_init() function should return int; same for functions
that have "return -ENODEV;" in them, actually ;-)

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Al Viro 2006-01-12 01:06:39 -08:00 committed by Linus Torvalds
parent 54a5a6eb58
commit ed1705afb9
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/video/macfb.c
View File

@ -609,18 +609,19 @@ void __init macfb_setup(char *options)
}
}
void __init macfb_init(void)
static int __init macfb_init(void)
{
int video_cmap_len, video_is_nubus = 0;
struct nubus_dev* ndev = NULL;
char *option = NULL;
int err;
if (fb_get_options("macfb", &option))
return -ENODEV;
macfb_setup(option);
if (!MACH_IS_MAC)
return;
return -ENODEV;
/* There can only be one internal video controller anyway so
we're not too worried about this */
@ -958,11 +959,11 @@ void __init macfb_init(void)
fb_alloc_cmap(&fb_info.cmap, video_cmap_len, 0);
if (register_framebuffer(&fb_info) < 0)
return;
printk("fb%d: %s frame buffer device\n",
fb_info.node, fb_info.fix.id);
err = register_framebuffer(&fb_info);
if (!err)
printk("fb%d: %s frame buffer device\n",
fb_info.node, fb_info.fix.id);
return err;
}
module_init(macfb_init);