Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/video/sm501fb.c b/drivers/video/sm501fb.c
index dcd98793d568..eb5d73a06702 100644
--- a/drivers/video/sm501fb.c
+++ b/drivers/video/sm501fb.c
@@ -1525,7 +1525,10 @@ static int sm501fb_init_fb(struct fb_info *fb,
         }
 
         /* initialise and set the palette */
-        fb_alloc_cmap(&fb->cmap, NR_PALETTE, 0);
+        if (fb_alloc_cmap(&fb->cmap, NR_PALETTE, 0)) {
+                dev_err(info->dev, "failed to allocate cmap memory\n");
+                return -ENOMEM;
+        }
         fb_set_cmap(&fb->cmap, fb);
 
         ret = (fb->fbops->fb_check_var)(&fb->var, fb);