From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Mon, 21 Nov 2011 20:53:53 +0000 (+0100)
Subject: fbdev/amifb: Fix double free
X-Git-Tag: v3.3-rc1~59^2~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=769ea33145b5f4c1f0d07e1d4db0121c4b98f81f;p=thirdparty%2Flinux.git

fbdev/amifb: Fix double free

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
---

diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c
index 72454c7381444..39d211ad164d3 100644
--- a/drivers/video/amifb.c
+++ b/drivers/video/amifb.c
@@ -2464,7 +2464,6 @@ static void amifb_deinit(struct platform_device *pdev)
 {
 	if (fb_info.cmap.len)
 		fb_dealloc_cmap(&fb_info.cmap);
-	fb_dealloc_cmap(&fb_info.cmap);
 	chipfree();
 	if (videomemory)
 		iounmap((void *)videomemory);