Commit b2a85aeb authored by Amol Lad's avatar Amol Lad Committed by Linus Torvalds

[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: default avatarAmol Lad <amol@verismonetworks.com>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent d8b8c0a6
...@@ -3527,6 +3527,10 @@ static int __devinit atyfb_setup_generic(struct pci_dev *pdev, struct fb_info *i ...@@ -3527,6 +3527,10 @@ static int __devinit atyfb_setup_generic(struct pci_dev *pdev, struct fb_info *i
atyfb_setup_generic_fail: atyfb_setup_generic_fail:
iounmap(par->ati_regbase); iounmap(par->ati_regbase);
par->ati_regbase = NULL; par->ati_regbase = NULL;
if (info->screen_base) {
iounmap(info->screen_base);
info->screen_base = NULL;
}
return ret; return ret;
} }
...@@ -3695,6 +3699,10 @@ static int __devinit atyfb_atari_probe(void) ...@@ -3695,6 +3699,10 @@ static int __devinit atyfb_atari_probe(void)
} }
if (aty_init(info, "ISA bus")) { 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); framebuffer_release(info);
/* This is insufficient! kernel_map has added two large chunks!! */ /* This is insufficient! kernel_map has added two large chunks!! */
return -ENXIO; return -ENXIO;
......
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