From: Amol Lad <amol@verismonetworks.com>
Date: Fri, 8 Dec 2006 10:40:16 +0000 (-0800)
Subject: [PATCH] ioremap balanced with iounmap for drivers/video/S3triofb
X-Git-Tag: v2.6.20-rc1~34^2~97
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=945f0ee257b4f91498b4061dc89b8a68c423ea6f;p=linux-2.6

[PATCH] ioremap balanced with iounmap for drivers/video/S3triofb

ioremap must be balanced by an iounmap and failing to do so can result in a
memory leak.

Signed-off-by: Amol Lad <amol@verismonetworks.com>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/video/S3triofb.c b/drivers/video/S3triofb.c
index 397005eb39..b3717c8f1b 100644
--- a/drivers/video/S3triofb.c
+++ b/drivers/video/S3triofb.c
@@ -535,8 +535,11 @@ static void __init s3triofb_of_init(struct device_node *dp)
 #endif
 
     fb_info.flags = FBINFO_FLAG_DEFAULT;
-    if (register_framebuffer(&fb_info) < 0)
-	return;
+    if (register_framebuffer(&fb_info) < 0) {
+		iounmap(fb_info.screen_base);
+		fb_info.screen_base = NULL;
+		return;
+    }
 
     printk("fb%d: S3 Trio frame buffer device on %s\n",
 	   fb_info.node, dp->full_name);