From: Roel Kluin <12o3l@tiscali.nl> Free buffer when the framebuffer can't be registered Signed-off-by: Roel Kluin <12o3l@tiscali.nl> Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton --- drivers/video/aty/atyfb_base.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff -puN drivers/video/aty/atyfb_base.c~free-when-fb-cant-be-registered-in-video-aty-atyfb_basec drivers/video/aty/atyfb_base.c --- a/drivers/video/aty/atyfb_base.c~free-when-fb-cant-be-registered-in-video-aty-atyfb_basec +++ a/drivers/video/aty/atyfb_base.c @@ -2621,10 +2621,13 @@ static int __devinit aty_init(struct fb_ #endif /* CONFIG_FB_ATY_CT */ info->var = var; - fb_alloc_cmap(&info->cmap, 256, 0); + if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) + goto aty_init_exit; - if (register_framebuffer(info) < 0) + if (register_framebuffer(info) < 0) { + fb_dealloc_cmap(&info->cmap); goto aty_init_exit; + } fb_list = info; _