diff --git a/[refs] b/[refs] index 3488c7d968d2..812e96c4d08f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1edcc10d7f4fd4085fcdcdd68afec258c3427530 +refs/heads/master: 34cae30b8457cf090f215e212ba019e7c303f8fd diff --git a/trunk/drivers/media/video/tw9910.c b/trunk/drivers/media/video/tw9910.c index 341d0e035cbf..5e7672abe815 100644 --- a/trunk/drivers/media/video/tw9910.c +++ b/trunk/drivers/media/video/tw9910.c @@ -830,7 +830,7 @@ static int tw9910_g_fmt(struct v4l2_subdev *sd, mf->height = priv->scale->height; mf->code = V4L2_MBUS_FMT_YVYU8_2X8_BE; mf->colorspace = V4L2_COLORSPACE_JPEG; - mf->field = V4L2_FIELD_INTERLACED; + mf->field = V4L2_FIELD_INTERLACED_BT; return 0; } @@ -852,7 +852,7 @@ static int tw9910_s_fmt(struct v4l2_subdev *sd, int ret; WARN_ON(mf->field != V4L2_FIELD_ANY && - mf->field != V4L2_FIELD_INTERLACED); + mf->field != V4L2_FIELD_INTERLACED_BT); /* * check color format @@ -878,8 +878,8 @@ static int tw9910_try_fmt(struct v4l2_subdev *sd, const struct tw9910_scale_ctrl *scale; if (V4L2_FIELD_ANY == mf->field) { - mf->field = V4L2_FIELD_INTERLACED; - } else if (V4L2_FIELD_INTERLACED != mf->field) { + mf->field = V4L2_FIELD_INTERLACED_BT; + } else if (V4L2_FIELD_INTERLACED_BT != mf->field) { dev_err(&client->dev, "Field type %d invalid.\n", mf->field); return -EINVAL; }