diff --git a/[refs] b/[refs]
index a872985598c1..016e20f628fc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 909baf0092545e5c2082b045303e7a4b1d2a0522
+refs/heads/master: eb8972b4407f81b07ea6fc71fd91f9fc7a35a81e
diff --git a/trunk/drivers/video/amifb.c b/trunk/drivers/video/amifb.c
index 100f23661465..82bedd7f7789 100644
--- a/trunk/drivers/video/amifb.c
+++ b/trunk/drivers/video/amifb.c
@@ -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);