diff --git a/[refs] b/[refs]
index 4c098ab0b32b..d90b767cd89f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f0c7d2b72ad1a694c0c886a14cc708841181e9bd
+refs/heads/master: a9672c4b861afcf547bfe2cafeec4ca85a63da67
diff --git a/trunk/drivers/video/tmiofb.c b/trunk/drivers/video/tmiofb.c
index a1eb0862255b..6913fe168c25 100644
--- a/trunk/drivers/video/tmiofb.c
+++ b/trunk/drivers/video/tmiofb.c
@@ -974,7 +974,7 @@ static int tmiofb_resume(struct platform_device *dev)
 {
 	struct fb_info *info = platform_get_drvdata(dev);
 	struct mfd_cell *cell = dev->dev.platform_data;
-	int retval;
+	int retval = 0;
 
 	acquire_console_sem();