summaryrefslogtreecommitdiffstats
path: root/drivers/video/aty/atyfb_base.c
diff options
context:
space:
mode:
authorAmol Lad <amol@verismonetworks.com>2006-12-08 02:40:14 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-08 08:29:05 -0800
commitb2a85aebf9d6cb671085d58dfbbd7b11269d49eb (patch)
tree0ab6a1a5fad03cd811913a7e3095f5c3072bbfb8 /drivers/video/aty/atyfb_base.c
parentd8b8c0a697d60c7d58a3dbda2d78553fd27727b3 (diff)
downloadblackbird-op-linux-b2a85aebf9d6cb671085d58dfbbd7b11269d49eb.tar.gz
blackbird-op-linux-b2a85aebf9d6cb671085d58dfbbd7b11269d49eb.zip
[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>
Diffstat (limited to 'drivers/video/aty/atyfb_base.c')
-rw-r--r--drivers/video/aty/atyfb_base.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index e815b354c09d..b7b4e61b2951 100644
--- 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;
OpenPOWER on IntegriCloud