Commit eb8972b4 authored by Andres Salomon's avatar Andres Salomon Committed by Linus Torvalds

amifb: check fb_alloc_cmap return value and handle failure properly

Signed-off-by: default avatarAndres Salomon <dilinger@debian.org>
Acked-by: default avatarKrzysztof Helt <krzysztof.h1@wp.pl>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 909baf00
...@@ -2437,7 +2437,9 @@ default_chipset: ...@@ -2437,7 +2437,9 @@ default_chipset:
goto amifb_error; 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) { if (register_framebuffer(&fb_info) < 0) {
err = -EINVAL; err = -EINVAL;
...@@ -2456,7 +2458,8 @@ amifb_error: ...@@ -2456,7 +2458,8 @@ amifb_error:
static void amifb_deinit(void) static void amifb_deinit(void)
{ {
fb_dealloc_cmap(&fb_info.cmap); if (fb_info.cmap.len)
fb_dealloc_cmap(&fb_info.cmap);
chipfree(); chipfree();
if (videomemory) if (videomemory)
iounmap((void*)videomemory); iounmap((void*)videomemory);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment