---

yaml --- r: 286425 b: refs/heads/master c: 7f6cce6 h: refs/heads/master i: 286423: 96b2fe5 v: v3
git-mirror · Jan 18, 2012 · af6fba8 · af6fba8
1 parent a097cbe
commit af6fba8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0da0a7833824b51488b81db002bb47ad8688f9bb
+refs/heads/master: 7f6cce69e2667fdf0ee978641ee4325ea05ce3f8
diff --git a/trunk/drivers/media/video/s5p-g2d/g2d.c b/trunk/drivers/media/video/s5p-g2d/g2d.c
@@ -184,6 +184,7 @@ static int g2d_s_ctrl(struct v4l2_ctrl *ctrl)
 			ctx->rop = ROP4_INVERT;
 		else
 			ctx->rop = ROP4_COPY;
+		break;
 	default:
 		v4l2_err(&ctx->dev->v4l2_dev, "unknown control\n");
 		return -EINVAL;