diff --git a/[refs] b/[refs]
index e59b91ed9513..91c5739ada99 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 398994c1e104324acc836894290f2453d7f75ff5
+refs/heads/master: 7874b9038da3ff54dd1667e6bab307e66030950e
diff --git a/trunk/drivers/media/video/tw9910.c b/trunk/drivers/media/video/tw9910.c
index 1fdc758041d5..3f96cb55dbbf 100644
--- a/trunk/drivers/media/video/tw9910.c
+++ b/trunk/drivers/media/video/tw9910.c
@@ -806,7 +806,7 @@ static int tw9910_g_fmt(struct v4l2_subdev *sd,
 
 	mf->width	= priv->scale->width;
 	mf->height	= priv->scale->height;
-	mf->code	= V4L2_MBUS_FMT_YVYU8_2X8_BE;
+	mf->code	= V4L2_MBUS_FMT_YUYV8_2X8_BE;
 	mf->colorspace	= V4L2_COLORSPACE_JPEG;
 	mf->field	= V4L2_FIELD_INTERLACED_BT;
 
@@ -835,7 +835,7 @@ static int tw9910_s_fmt(struct v4l2_subdev *sd,
 	/*
 	 * check color format
 	 */
-	if (mf->code != V4L2_MBUS_FMT_YVYU8_2X8_BE)
+	if (mf->code != V4L2_MBUS_FMT_YUYV8_2X8_BE)
 		return -EINVAL;
 
 	mf->colorspace = V4L2_COLORSPACE_JPEG;
@@ -862,7 +862,7 @@ static int tw9910_try_fmt(struct v4l2_subdev *sd,
 		return -EINVAL;
 	}
 
-	mf->code = V4L2_MBUS_FMT_YVYU8_2X8_BE;
+	mf->code = V4L2_MBUS_FMT_YUYV8_2X8_BE;
 	mf->colorspace = V4L2_COLORSPACE_JPEG;
 
 	/*
@@ -947,7 +947,7 @@ static int tw9910_enum_fmt(struct v4l2_subdev *sd, int index,
 	if (index)
 		return -EINVAL;
 
-	*code = V4L2_MBUS_FMT_YVYU8_2X8_BE;
+	*code = V4L2_MBUS_FMT_YUYV8_2X8_BE;
 	return 0;
 }