diff --git a/[refs] b/[refs]
index c9e92995d613..28ca0ff68e26 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b7574da255fef27cdb294e19bea26d911443511
+refs/heads/master: f190017b889c45364576396a3bfa32acbb16bf2b
diff --git a/trunk/drivers/video/offb.c b/trunk/drivers/video/offb.c
index 9a40bbecf76b..9576a55eaf16 100644
--- a/trunk/drivers/video/offb.c
+++ b/trunk/drivers/video/offb.c
@@ -402,6 +402,9 @@ static void __init offb_init_fb(const char *name, const char *full_name,
 	fb_alloc_cmap(&info->cmap, 256, 0);
 
 	if (register_framebuffer(info) < 0) {
+		iounmap(par->cmap_adr);
+		par->cmap_adr = NULL;
+		iounmap(info->screen_base);
 		kfree(info);
 		release_mem_region(res_start, res_size);
 		return;