[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>

authored by Al Viro and committed by Linus Torvalds ed1705af 54a5a6eb

+8 -7
+8 -7
drivers/video/macfb.c
··· 609 609 } 610 610 } 611 611 612 - void __init macfb_init(void) 612 + static int __init macfb_init(void) 613 613 { 614 614 int video_cmap_len, video_is_nubus = 0; 615 615 struct nubus_dev* ndev = NULL; 616 616 char *option = NULL; 617 + int err; 617 618 618 619 if (fb_get_options("macfb", &option)) 619 620 return -ENODEV; 620 621 macfb_setup(option); 621 622 622 623 if (!MACH_IS_MAC) 623 - return; 624 + return -ENODEV; 624 625 625 626 /* There can only be one internal video controller anyway so 626 627 we're not too worried about this */ ··· 959 958 960 959 fb_alloc_cmap(&fb_info.cmap, video_cmap_len, 0); 961 960 962 - if (register_framebuffer(&fb_info) < 0) 963 - return; 964 - 965 - printk("fb%d: %s frame buffer device\n", 966 - fb_info.node, fb_info.fix.id); 961 + err = register_framebuffer(&fb_info); 962 + if (!err) 963 + printk("fb%d: %s frame buffer device\n", 964 + fb_info.node, fb_info.fix.id); 965 + return err; 967 966 } 968 967 969 968 module_init(macfb_init);