diff --git a/[refs] b/[refs]
index 23349621fe5c..1be8eb5acfe6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e4bf051b4f3121c5abdde836b1429e4a4459adb4
+refs/heads/master: 9cf2014aad58076aa22faacf27742d9610dea05d
diff --git a/trunk/drivers/video/stifb.c b/trunk/drivers/video/stifb.c
index 3e16e2d9d55d..69f3b264a22e 100644
--- a/trunk/drivers/video/stifb.c
+++ b/trunk/drivers/video/stifb.c
@@ -1291,6 +1291,7 @@ stifb_init_fb(struct sti_struct *sti, int bpp_pref)
 out_err2:
 	release_mem_region(fix->smem_start, fix->smem_len);
 out_err1:
+	iounmap(info->screen_base);
 	fb_dealloc_cmap(&info->cmap);
 out_err0:
 	kfree(fb);
@@ -1364,6 +1365,8 @@ stifb_cleanup(void)
 			unregister_framebuffer(sti->info);
 			release_mem_region(info->fix.mmio_start, info->fix.mmio_len);
 		        release_mem_region(info->fix.smem_start, info->fix.smem_len);
+				if (info->screen_base)
+					iounmap(info->screen_base);
 		        fb_dealloc_cmap(&info->cmap);
 		        kfree(info); 
 		}