Commit 8d4c767e authored by Amol Lad's avatar Amol Lad Committed by Linus Torvalds

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

ioremap must be balanced by an iounmap and failing to do so can result in a
memory leak.
Signed-off-by: default avatarAmol Lad <amol@verismonetworks.com>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 1b3349fa
...@@ -968,6 +968,8 @@ static int ffb_init_one(struct of_device *op) ...@@ -968,6 +968,8 @@ static int ffb_init_one(struct of_device *op)
if (fb_alloc_cmap(&all->info.cmap, 256, 0)) { if (fb_alloc_cmap(&all->info.cmap, 256, 0)) {
printk(KERN_ERR "ffb: Could not allocate color map.\n"); printk(KERN_ERR "ffb: Could not allocate color map.\n");
of_iounmap(all->par.fbc, sizeof(struct ffb_fbc));
of_iounmap(all->par.dac, sizeof(struct ffb_dac));
kfree(all); kfree(all);
return -ENOMEM; return -ENOMEM;
} }
...@@ -978,6 +980,8 @@ static int ffb_init_one(struct of_device *op) ...@@ -978,6 +980,8 @@ static int ffb_init_one(struct of_device *op)
if (err < 0) { if (err < 0) {
printk(KERN_ERR "ffb: Could not register framebuffer.\n"); printk(KERN_ERR "ffb: Could not register framebuffer.\n");
fb_dealloc_cmap(&all->info.cmap); fb_dealloc_cmap(&all->info.cmap);
of_iounmap(all->par.fbc, sizeof(struct ffb_fbc));
of_iounmap(all->par.dac, sizeof(struct ffb_dac));
kfree(all); kfree(all);
return err; return err;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment