summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndres Salomon <dilinger@queued.net>2009-03-31 15:25:30 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-01 08:59:31 -0700
commiteb8972b4407f81b07ea6fc71fd91f9fc7a35a81e (patch)
tree19b3bed57ec0c767d39a509ae99fa973016d6b8a
parent909baf0092545e5c2082b045303e7a4b1d2a0522 (diff)
downloadlinux-3.10-eb8972b4407f81b07ea6fc71fd91f9fc7a35a81e.tar.gz
linux-3.10-eb8972b4407f81b07ea6fc71fd91f9fc7a35a81e.tar.bz2
linux-3.10-eb8972b4407f81b07ea6fc71fd91f9fc7a35a81e.zip
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>
-rw-r--r--drivers/video/amifb.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c
index 100f2366146..82bedd7f778 100644
--- a/drivers/video/amifb.c
+++ b/drivers/video/amifb.c
@@ -2437,7 +2437,9 @@ default_chipset:
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 @@ amifb_error:
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);