forked from luck/tmp_suning_uos_patched
amifb: check fb_alloc_cmap return value and handle failure properly
Signed-off-by: Andres Salomon <dilinger@debian.org> Acked-by: Krzysztof Helt <krzysztof.h1@wp.pl> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
909baf0092
commit
eb8972b440
|
@ -2437,7 +2437,9 @@ static int __init amifb_init(void)
|
|||
goto amifb_error;
|
||||
}
|
||||
|
||||
fb_alloc_cmap(&fb_info.cmap, 1<<fb_info.var.bits_per_pixel, 0);
|
||||
err = fb_alloc_cmap(&fb_info.cmap, 1<<fb_info.var.bits_per_pixel, 0);
|
||||
if (err)
|
||||
goto amifb_error;
|
||||
|
||||
if (register_framebuffer(&fb_info) < 0) {
|
||||
err = -EINVAL;
|
||||
|
@ -2456,7 +2458,8 @@ static int __init amifb_init(void)
|
|||
|
||||
static void amifb_deinit(void)
|
||||
{
|
||||
fb_dealloc_cmap(&fb_info.cmap);
|
||||
if (fb_info.cmap.len)
|
||||
fb_dealloc_cmap(&fb_info.cmap);
|
||||
chipfree();
|
||||
if (videomemory)
|
||||
iounmap((void*)videomemory);
|
||||
|
|
Loading…
Reference in New Issue
Block a user