---

yaml --- r: 306425 b: refs/heads/master c: cbde6a2 h: refs/heads/master i: 306423: 1bb03bd v: v3
git-mirror · May 15, 2012 · 200f6e4 · 200f6e4
1 parent 54e4e0f
commit 200f6e4
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git 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
@@ -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;