diff --git a/[refs] b/[refs]
index 052ac3ac79c9..fce56cd412ed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 164a765b9895f4f80f91cb7f1aab7539b3f8d335
+refs/heads/master: 1bedb0b2f60dd858fd12e5dd5681fa5da55175f5
diff --git a/trunk/drivers/video/hpfb.c b/trunk/drivers/video/hpfb.c
index 91cf3b577d15..9ab9b839a0f5 100644
--- a/trunk/drivers/video/hpfb.c
+++ b/trunk/drivers/video/hpfb.c
@@ -295,6 +295,8 @@ static int __init hpfb_init_one(unsigned long phys_base, unsigned long virt_base
 
 	if (register_framebuffer(&fb_info) < 0) {
 		fb_dealloc_cmap(&fb_info.cmap);
+		iounmap(fb_info.screen_base);
+		fb_info.screen_base = NULL;
 		return 1;
 	}