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

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: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index e815b354c09df1f57ba5fa83bab29706ff6029f9..b7b4e61b29519a04ffa088de21cb94e5095094ea 100644 (file)
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -3527,6 +3527,10 @@ static int __devinit atyfb_setup_generic(struct pci_dev *pdev, struct fb_info *i
 atyfb_setup_generic_fail:
        iounmap(par->ati_regbase);
        par->ati_regbase = NULL;
+       if (info->screen_base) {
+               iounmap(info->screen_base);
+               info->screen_base = NULL;
+       }
        return ret;
 }
 
@@ -3695,6 +3699,10 @@ static int __devinit atyfb_atari_probe(void)
                }
 
                if (aty_init(info, "ISA bus")) {
+                       if (info->screen_base)
+                               iounmap(info->screen_base);
+                       if (par->ati_regbase)
+                               iounmap(par->ati_regbase);
                        framebuffer_release(info);
                        /* This is insufficient! kernel_map has added two large chunks!! */
                        return -ENXIO;