diff --git a/[refs] b/[refs]
index c3e31bf640a6..2c9b02e10f46 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8d4c767ef56473b68a601274612d604c8c334dc9
+refs/heads/master: d02abed8aa6bd37abcd802de64a63ed2af5e18ff
diff --git a/trunk/drivers/video/cyberfb.c b/trunk/drivers/video/cyberfb.c
index c40e72dafb0e..bc1cc44b1e3f 100644
--- a/trunk/drivers/video/cyberfb.c
+++ b/trunk/drivers/video/cyberfb.c
@@ -1055,6 +1055,8 @@ int __init cyberfb_init(void)
 
 	    if (register_framebuffer(&fb_info) < 0) {
 		    DPRINTK("EXIT - register_framebuffer failed\n");
+			if (CyberBase)
+				iounmap(CyberBase);
 		    release_mem_region(CyberMem_phys, 0x400000);
 		    release_mem_region(CyberRegs_phys, 0x10000);
 		    return -EINVAL;