From 84a2fc99018b3ec7e1c9dc3a62bbc8ae1d801f3d Mon Sep 17 00:00:00 2001
From: Shaik Ameer Basha <shaik.ameer@samsung.com>
Date: Tue, 16 Oct 2012 09:39:08 -0300
Subject: [PATCH] --- yaml --- r: 343781 b: refs/heads/master c:
 a63bafd8e3a48263983e046ba34607d1ceb1743b h: refs/heads/master i:   343779:
 b339a2b6d596c8cf951667f66f1e8a00c6bb89ef v: v3

---
 [refs]                                           | 2 +-
 trunk/drivers/media/platform/s5p-fimc/fimc-m2m.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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;