diff --git a/[refs] b/[refs]
index 38f67194dc98..84616f2b8551 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 57354c42f177a2b58fb1f61125ad2cb2e8743a9b
+refs/heads/master: 945f0ee257b4f91498b4061dc89b8a68c423ea6f
diff --git a/trunk/drivers/video/S3triofb.c b/trunk/drivers/video/S3triofb.c
index 397005eb392d..b3717c8f1bc2 100644
--- a/trunk/drivers/video/S3triofb.c
+++ b/trunk/drivers/video/S3triofb.c
@@ -535,8 +535,11 @@ static void __init s3triofb_of_init(struct device_node *dp)
 #endif
 
     fb_info.flags = FBINFO_FLAG_DEFAULT;
-    if (register_framebuffer(&fb_info) < 0)
-	return;
+    if (register_framebuffer(&fb_info) < 0) {
+		iounmap(fb_info.screen_base);
+		fb_info.screen_base = NULL;
+		return;
+    }
 
     printk("fb%d: S3 Trio frame buffer device on %s\n",
 	   fb_info.node, dp->full_name);