amba-clcd: fix cmap memory leaks
- fix cmap leak in removal path - fix cmap leak when register_framebuffer fails Signed-off-by: Andres Salomon <dilinger@debian.org> Acked-by: Krzysztof Helt <krzysztof.h1@wp.pl> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
e98d9b407c
commit
909baf0092
|
@ -408,7 +408,9 @@ static int clcdfb_register(struct clcd_fb *fb)
|
|||
/*
|
||||
* Allocate colourmap.
|
||||
*/
|
||||
fb_alloc_cmap(&fb->fb.cmap, 256, 0);
|
||||
ret = fb_alloc_cmap(&fb->fb.cmap, 256, 0);
|
||||
if (ret)
|
||||
goto unmap;
|
||||
|
||||
/*
|
||||
* Ensure interrupts are disabled.
|
||||
|
@ -426,6 +428,8 @@ static int clcdfb_register(struct clcd_fb *fb)
|
|||
|
||||
printk(KERN_ERR "CLCD: cannot register framebuffer (%d)\n", ret);
|
||||
|
||||
fb_dealloc_cmap(&fb->fb.cmap);
|
||||
unmap:
|
||||
iounmap(fb->regs);
|
||||
free_clk:
|
||||
clk_put(fb->clk);
|
||||
|
@ -485,6 +489,8 @@ static int clcdfb_remove(struct amba_device *dev)
|
|||
|
||||
clcdfb_disable(fb);
|
||||
unregister_framebuffer(&fb->fb);
|
||||
if (fb->fb.cmap.len)
|
||||
fb_dealloc_cmap(&fb->fb.cmap);
|
||||
iounmap(fb->regs);
|
||||
clk_put(fb->clk);
|
||||
|
||||
|
|
Loading…
Reference in a new issue