diff --git a/[refs] b/[refs]
index 1f2e73c0e3dd..29dfd600a7ae 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4bd0e030aadaba4a0e8fd5c0233d7e61f2e6207d
+refs/heads/master: a63bafd8e3a48263983e046ba34607d1ceb1743b
diff --git a/trunk/drivers/media/platform/s5p-fimc/fimc-m2m.c b/trunk/drivers/media/platform/s5p-fimc/fimc-m2m.c
index 4500e44f6857..4c4e90105112 100644
--- a/trunk/drivers/media/platform/s5p-fimc/fimc-m2m.c
+++ b/trunk/drivers/media/platform/s5p-fimc/fimc-m2m.c
@@ -105,7 +105,7 @@ static void fimc_device_run(void *priv)
 	struct fimc_frame *sf, *df;
 	struct fimc_dev *fimc;
 	unsigned long flags;
-	u32 ret;
+	int ret;
 
 	if (WARN(!ctx, "Null context\n"))
 		return;