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

1 files changed, 8 insertions, 7 deletions

diff --git a/drivers/video/macfb.c b/drivers/video/macfb.c
index cfc748e9427..e6cbd9de944 100644
--- a/drivers/video/macfb.c
+++ b/drivers/video/macfb.c
@@ -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);