diff --git a/[refs] b/[refs]
index 98a4a8d40002..b284cff9eb20 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0d066d3f6fdfd189bef5fe653477f5f9db2eb225
+refs/heads/master: 392d9e1d02edcbe9bc94bc292dd364339556f8ec
diff --git a/trunk/drivers/media/video/s5p-tv/mixer_vp_layer.c b/trunk/drivers/media/video/s5p-tv/mixer_vp_layer.c
index e41ec2ec45f8..3d13a636877b 100644
--- a/trunk/drivers/media/video/s5p-tv/mixer_vp_layer.c
+++ b/trunk/drivers/media/video/s5p-tv/mixer_vp_layer.c
@@ -172,10 +172,10 @@ static void mxr_vp_fix_geometry(struct mxr_layer *layer,
 		y_center = src->y_offset + src->height / 2;
 
 		/* ensure scaling is between 0.25x .. 16x */
-		src->width = clamp(src->width, round_up(dst->width, 4),
-			dst->width * 16);
-		src->height = clamp(src->height, round_up(dst->height, 4),
-			dst->height * 16);
+		src->width = clamp(src->width, round_up(dst->width / 16, 4),
+			dst->width * 4);
+		src->height = clamp(src->height, round_up(dst->height / 16, 4),
+			dst->height * 4);
 
 		/* hardware limits */
 		src->width = clamp(src->width, 32U, 2047U);