adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-27 19:26:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

sunxvr500: fix cmap memory leaks

Browse source 
- fix cmap leak in removal path
 - fix cmap leak when register_framebuffer fails

Signed-off-by: Andres Salomon <dilinger@debian.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Krzysztof Helt <krzysztof.h1@poczta.fm>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Andres Salomon 2009-03-31 15:25:27 -07:00 committed by Linus Torvalds
parent ccb121e695
commit cc880a7157
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/video/sunxvr500.c
View file

@ -349,11 +349,14 @@ static int __devinit e3d_pci_register(struct pci_dev *pdev,
if (err < 0) { if (err < 0) {
printk(KERN_ERR "e3d: Could not register framebuffer %s\n", printk(KERN_ERR "e3d: Could not register framebuffer %s\n",
pci_name(pdev)); pci_name(pdev));
goto err_unmap_fb; goto err_free_cmap;
} }
return 0; return 0;
err_free_cmap:
fb_dealloc_cmap(&info->cmap);
err_unmap_fb: err_unmap_fb:
iounmap(ep->fb_base); iounmap(ep->fb_base);
@ -389,6 +392,7 @@ static void __devexit e3d_pci_unregister(struct pci_dev *pdev)
pci_release_region(pdev, 0); pci_release_region(pdev, 0);
pci_release_region(pdev, 1); pci_release_region(pdev, 1);
fb_dealloc_cmap(&info->cmap);
framebuffer_release(info); framebuffer_release(info);
pci_disable_device(pdev); pci_disable_device(pdev);