Skip to content

Commit

Permalink
amifb: check fb_alloc_cmap return value and handle failure properly
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Andres Salomon authored and Linus Torvalds committed Apr 1, 2009
1 parent 909baf0 commit eb8972b
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions drivers/video/amifb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand Down

0 comments on commit eb8972b

Please sign in to comment.