[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: Amol Lad <amol@verismonetworks.com>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/video/ffb.c b/drivers/video/ffb.c
index 2a0e8210d398e6c964aa69028161cd3af471a44d..949141bd44d44af445eeba4035b939f8c728f21f 100644 (file)
--- a/drivers/video/ffb.c
+++ b/drivers/video/ffb.c
@@ -968,6 +968,8 @@ static int ffb_init_one(struct of_device *op)
 
        if (fb_alloc_cmap(&all->info.cmap, 256, 0)) {
                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);
                return -ENOMEM;
        }
@@ -978,6 +980,8 @@ static int ffb_init_one(struct of_device *op)
        if (err < 0) {
                printk(KERN_ERR "ffb: Could not register framebuffer.\n");
                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);
                return err;
        }