From: Roel Kluin <12o3l@tiscali.nl>
Date: Mon, 28 Apr 2008 09:15:04 +0000 (-0700)
Subject: video/aty/atyfb_base.c: free when fb can't be registered
X-Git-Tag: v2.6.26-rc1~827
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=21b4d1db84a70175251d86078123cc27e46ff69d;p=linux-2.6

video/aty/atyfb_base.c: free when fb can't be registered

Free buffer when the framebuffer can't be registered

Signed-off-by: Roel Kluin <12o3l@tiscali.nl>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index 62f9c6e387..e4bcf5376a 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -2621,10 +2621,13 @@ static int __devinit aty_init(struct fb_info *info)
 #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;