m68k: fix macfb init
PATCH 39/41 m68k: fix macfb init
From: Al Viro <[email protected]>
Date: 1135379495 -0500
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 <[email protected]>
(cherry picked from fc7dce1052e33568ffbdc847abf26beb7f685081 commit)
---
drivers/video/macfb.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-)
cdddc53bc6ba2d45aa0fb58d429751e8e8979012
drivers/video/macfb.c +8 -7
@@ -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);
Signature · 1 line
0.99.9.GIT