summaryrefslogtreecommitdiffstats
path: root/drivers/video/S3triofb.c
diff options
context:
space:
mode:
authorAmol Lad <amol@verismonetworks.com>2006-12-08 11:40:16 +0100
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-08 17:29:05 +0100
commit945f0ee257b4f91498b4061dc89b8a68c423ea6f (patch)
tree5b87738d5e264a7fe7186cf862207f46eee6bd33 /drivers/video/S3triofb.c
parent[PATCH] ioremap balanced with iounmap for drivers/video/amifb (diff)
downloadlinux-945f0ee257b4f91498b4061dc89b8a68c423ea6f.tar.xz
linux-945f0ee257b4f91498b4061dc89b8a68c423ea6f.zip
[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>
Diffstat (limited to 'drivers/video/S3triofb.c')
-rw-r--r--drivers/video/S3triofb.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/video/S3triofb.c b/drivers/video/S3triofb.c
index 397005eb392d..b3717c8f1bc2 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);