diff options
| author | Amol Lad <amol@verismonetworks.com> | 2006-12-08 11:40:15 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 17:29:05 +0100 |
| commit | 6792951b6ad13d7b2fff71ae7d2982b2fa1d6788 (patch) | |
| tree | b4dc4d0e472a15c91e29495c1e6086172036fbd5 /drivers/video/atafb.c | |
| parent | [PATCH] ioremap balanced with iounmap for drivers/video/atyfb_base (diff) | |
| download | linux-6792951b6ad13d7b2fff71ae7d2982b2fa1d6788.tar.xz linux-6792951b6ad13d7b2fff71ae7d2982b2fa1d6788.zip | |
[PATCH] ioremap balanced with iounmap for drivers/video/atafb
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>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/video/atafb.c')
| -rw-r--r-- | drivers/video/atafb.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/drivers/video/atafb.c b/drivers/video/atafb.c index 02c41a626fa2..602db660bc73 100644 --- a/drivers/video/atafb.c +++ b/drivers/video/atafb.c @@ -2804,8 +2804,19 @@ int __init atafb_init(void) atafb_set_disp(-1, &fb_info); do_install_cmap(0, &fb_info); - if (register_framebuffer(&fb_info) < 0) + if (register_framebuffer(&fb_info) < 0) { +#ifdef ATAFB_EXT + if (external_addr) { + iounmap(external_addr); + external_addr = NULL; + } + if (external_vgaiobase) { + iounmap((void*)external_vgaiobase); + external_vgaiobase = 0; + } +#endif return -EINVAL; + } printk("Determined %dx%d, depth %d\n", disp.var.xres, disp.var.yres, disp.var.bits_per_pixel); |