diff --git a/[refs] b/[refs]
index b0ed39ca656a..d0486a65ff1e 100644
--- 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
index c40b0dde1883..febaa673d363 100644
--- 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;