From 200f6e4921024f27b1d6c588f61ad3a68803ecb4 Mon Sep 17 00:00:00 2001
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Date: Tue, 8 May 2012 12:56:15 -0300
Subject: [PATCH] --- yaml --- r: 306425 b: refs/heads/master c:
 cbde6a2dbaf704defb95958af335fddd770edc4c h: refs/heads/master i:   306423:
 1bb03bd23aedbb78f2dc5ce6539dc7243ba991e3 v: v3

---
 [refs]                                             | 2 +-
 trunk/drivers/media/video/marvell-ccic/mcam-core.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d876cf3fe2cb..b3cb8cb32b1e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e6d76cdc541e28bf4f609141d76c488c6c0d263
+refs/heads/master: cbde6a2dbaf704defb95958af335fddd770edc4c
diff --git a/trunk/drivers/media/video/marvell-ccic/mcam-core.c b/trunk/drivers/media/video/marvell-ccic/mcam-core.c
index 996ac34d9a89..ce2b7b4788d6 100644
--- a/trunk/drivers/media/video/marvell-ccic/mcam-core.c
+++ b/trunk/drivers/media/video/marvell-ccic/mcam-core.c
@@ -1356,7 +1356,6 @@ static int mcam_vidioc_s_fmt_vid_cap(struct file *filp, void *priv,
 			goto out;
 	}
 	mcam_set_config_needed(cam, 1);
-	ret = 0;
 out:
 	mutex_unlock(&cam->s_mutex);
 	return ret;