68328fb: fix cmap memory leaks
- fix cmap leak in removal path - fix cmap leak when register_framebuffer fails - check return value of fb_alloc_cmap 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
327fc8752a
commit
e98d9b407c
|
@ -471,9 +471,11 @@ int __init mc68x328fb_init(void)
|
||||||
fb_info.pseudo_palette = &mc68x328fb_pseudo_palette;
|
fb_info.pseudo_palette = &mc68x328fb_pseudo_palette;
|
||||||
fb_info.flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN;
|
fb_info.flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN;
|
||||||
|
|
||||||
fb_alloc_cmap(&fb_info.cmap, 256, 0);
|
if (fb_alloc_cmap(&fb_info.cmap, 256, 0))
|
||||||
|
return -ENOMEM;
|
||||||
|
|
||||||
if (register_framebuffer(&fb_info) < 0) {
|
if (register_framebuffer(&fb_info) < 0) {
|
||||||
|
fb_dealloc_cmap(&fb_info.cmap);
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -494,6 +496,7 @@ module_init(mc68x328fb_init);
|
||||||
static void __exit mc68x328fb_cleanup(void)
|
static void __exit mc68x328fb_cleanup(void)
|
||||||
{
|
{
|
||||||
unregister_framebuffer(&fb_info);
|
unregister_framebuffer(&fb_info);
|
||||||
|
fb_dealloc_cmap(&fb_info.cmap);
|
||||||
}
|
}
|
||||||
|
|
||||||
module_exit(mc68x328fb_cleanup);
|
module_exit(mc68x328fb_cleanup);
|
||||||
|
|
Loading…
Reference in New Issue