Merge branch 'master' into for_paulus

[linux-drm-fsl-dcu.git] / drivers / video / retz3fb.c

diff --git a/drivers/video/retz3fb.c b/drivers/video/retz3fb.c
index cf41ff177644c3d9ecdb843a2f1790f5d73fb314..bc7ffc84e1855cf0276b1a6e0470a26cf8abb184 100644 (file)
--- a/drivers/video/retz3fb.c
+++ b/drivers/video/retz3fb.c
@@ -1423,8 +1423,10 @@ int __init retz3fb_init(void)
 
                do_install_cmap(0, fb_info);
 
-               if (register_framebuffer(fb_info) < 0)
+               if (register_framebuffer(fb_info) < 0) {
+                       iounmap(zinfo->base);
                        return -EINVAL;
+               }
 
                printk(KERN_INFO "fb%d: %s frame buffer device, using %ldK of "
                       "video memory\n", fb_info->node,