mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
[PATCH] ioremap balanced with iounmap for drivers/video/cirrusfb
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>
This commit is contained in:
parent
d02abed8aa
commit
d8b8c0a697
1 changed files with 13 additions and 2 deletions
|
@ -2442,7 +2442,10 @@ static int cirrusfb_pci_register (struct pci_dev *pdev,
|
|||
printk ("Cirrus Logic chipset on PCI bus\n");
|
||||
pci_set_drvdata(pdev, info);
|
||||
|
||||
return cirrusfb_register(cinfo);
|
||||
ret = cirrusfb_register(cinfo);
|
||||
if (ret)
|
||||
iounmap(cinfo->fbmem);
|
||||
return ret;
|
||||
|
||||
err_release_legacy:
|
||||
if (release_io_ports)
|
||||
|
@ -2574,7 +2577,15 @@ static int cirrusfb_zorro_register(struct zorro_dev *z,
|
|||
printk (KERN_INFO "Cirrus Logic chipset on Zorro bus\n");
|
||||
zorro_set_drvdata(z, info);
|
||||
|
||||
return cirrusfb_register(cinfo);
|
||||
ret = cirrusfb_register(cinfo);
|
||||
if (ret) {
|
||||
if (btype == BT_PICASSO4) {
|
||||
iounmap(cinfo->fbmem);
|
||||
iounmap(cinfo->regbase - 0x600000);
|
||||
} else if (board_addr > 0x01000000)
|
||||
iounmap(cinfo->fbmem);
|
||||
}
|
||||
return ret;
|
||||
|
||||
err_unmap_regbase:
|
||||
/* Parental advisory: explicit hack */
|
||||
|
|
Loading…
Reference in a new issue