From: Laurent Pinchart Date: Mon, 19 May 2014 15:04:32 +0000 (-0300) Subject: [media] v4l: s3c-camif: Return V4L2_FIELD_NONE from pad-level set format X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6c5bba9b0ae140e76782fcd4d3dd83fa6d6db417;p=linux-beck.git [media] v4l: s3c-camif: Return V4L2_FIELD_NONE from pad-level set format The bridge driver doesn't support interlaced formats, always return the field order set to V4L2_FIELD_NONE. Signed-off-by: Laurent Pinchart Acked-by: Sylwester Nawrocki Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/platform/s3c-camif/camif-capture.c b/drivers/media/platform/s3c-camif/camif-capture.c index 8ea520935867..f33641384e15 100644 --- a/drivers/media/platform/s3c-camif/camif-capture.c +++ b/drivers/media/platform/s3c-camif/camif-capture.c @@ -1270,6 +1270,7 @@ static int s3c_camif_subdev_get_fmt(struct v4l2_subdev *sd, } mutex_unlock(&camif->lock); + mf->field = V4L2_FIELD_NONE; mf->colorspace = V4L2_COLORSPACE_JPEG; return 0; } @@ -1318,6 +1319,7 @@ static int s3c_camif_subdev_set_fmt(struct v4l2_subdev *sd, v4l2_dbg(1, debug, sd, "pad%d: code: 0x%x, %ux%u\n", fmt->pad, mf->code, mf->width, mf->height); + mf->field = V4L2_FIELD_NONE; mf->colorspace = V4L2_COLORSPACE_JPEG; mutex_lock(&camif->lock);