Skip to content

Commit

Permalink
[PATCH] ioremap balanced with iounmap for drivers/video/virgefb
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Amol Lad authored and Linus Torvalds committed Dec 8, 2006
1 parent dd607d2 commit ef26dd7
Showing 1 changed file with 16 additions and 1 deletion.
17 changes: 16 additions & 1 deletion drivers/video/virgefb.c
Original file line number Diff line number Diff line change
Expand Up @@ -1799,7 +1799,7 @@ int __init virgefb_init(void)
#warning release resources
printk(KERN_ERR "virgefb.c: register_framebuffer failed\n");
DPRINTK("EXIT\n");
return -EINVAL;
goto out_unmap;
}

printk(KERN_INFO "fb%d: %s frame buffer device, using %ldK of video memory\n",
Expand All @@ -1809,6 +1809,21 @@ int __init virgefb_init(void)

DPRINTK("EXIT\n");
return 0;

out_unmap:
if (board_addr >= 0x01000000) {
if (v_ram)
iounmap((void*)v_ram);
if (vgaio_regs)
iounmap(vgaio_regs);
if (mmio_regs)
iounmap(mmio_regs);
if (vcode_switch_base)
iounmap((void*)vcode_switch_base);
v_ram = vcode_switch_base = 0;
vgaio_regs = mmio_regs = NULL;
}
return -EINVAL;
}


Expand Down

0 comments on commit ef26dd7

Please sign in to comment.