summaryrefslogtreecommitdiff
path: root/drivers/video/fbdev/imsttfb.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video/fbdev/imsttfb.c')
-rw-r--r--drivers/video/fbdev/imsttfb.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/fbdev/imsttfb.c b/drivers/video/fbdev/imsttfb.c
index b194e71f07bf..aa51cb72cbba 100644
--- a/drivers/video/fbdev/imsttfb.c
+++ b/drivers/video/fbdev/imsttfb.c
@@ -1419,7 +1419,6 @@ static int init_imstt(struct fb_info *info)
if ((info->var.xres * info->var.yres) * (info->var.bits_per_pixel >> 3) > info->fix.smem_len
|| !(compute_imstt_regvals(par, info->var.xres, info->var.yres))) {
printk("imsttfb: %ux%ux%u not supported\n", info->var.xres, info->var.yres, info->var.bits_per_pixel);
- framebuffer_release(info);
return -ENODEV;
}
@@ -1452,10 +1451,11 @@ static int init_imstt(struct fb_info *info)
FBINFO_HWACCEL_FILLRECT |
FBINFO_HWACCEL_YPAN;
- fb_alloc_cmap(&info->cmap, 0, 0);
+ if (fb_alloc_cmap(&info->cmap, 0, 0))
+ return -ENODEV;
if (register_framebuffer(info) < 0) {
- framebuffer_release(info);
+ fb_dealloc_cmap(&info->cmap);
return -ENODEV;
}