forked from luck/tmp_suning_uos_patched
[PATCH] ioremap balanced with iounmap for drivers/video/macfb
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>
This commit is contained in:
parent
f190017b88
commit
164a765b98
@ -608,6 +608,22 @@ void __init macfb_setup(char *options)
|
||||
}
|
||||
}
|
||||
|
||||
static void __init iounmap_macfb(void)
|
||||
{
|
||||
if (valkyrie_cmap_regs)
|
||||
iounmap(valkyrie_cmap_regs);
|
||||
if (dafb_cmap_regs)
|
||||
iounmap(dafb_cmap_regs);
|
||||
if (v8_brazil_cmap_regs)
|
||||
iounmap(v8_brazil_cmap_regs);
|
||||
if (rbv_cmap_regs)
|
||||
iounmap(rbv_cmap_regs);
|
||||
if (civic_cmap_regs)
|
||||
iounmap(civic_cmap_regs);
|
||||
if (csc_cmap_regs)
|
||||
iounmap(csc_cmap_regs);
|
||||
}
|
||||
|
||||
static int __init macfb_init(void)
|
||||
{
|
||||
int video_cmap_len, video_is_nubus = 0;
|
||||
@ -962,6 +978,10 @@ static int __init macfb_init(void)
|
||||
if (!err)
|
||||
printk("fb%d: %s frame buffer device\n",
|
||||
fb_info.node, fb_info.fix.id);
|
||||
else {
|
||||
iounmap(fb_info.screen_base);
|
||||
iounmap_macfb();
|
||||
}
|
||||
return err;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user