Commit f00ae754 authored Sep 03, 2015 by Sergei Shtylyov Committed by Mauro Carvalho Chehab Sep 25, 2015

[media] rcar_vin: call g_std() instead of querystd()

Hans Verkuil says: "The only place querystd can be called is in the QUERYSTD
ioctl, all other ioctls should use the last set standard." So call the g_std()
subdevice method instead of querystd() in the driver's set_fmt() method.

Reported-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

parent 936ad890

drivers/media/platform/soc_camera/rcar_vin.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1600,8 +1600,8 @@ static int rcar_vin_set_fmt(struct soc_camera_device *icd,
	field = pix->field;		field = pix->field;
	break;		break;
	case V4L2_FIELD_INTERLACED:		case V4L2_FIELD_INTERLACED:
	/* Query for standard if not explicitly mentioned _TB/_BT */		/* Get the last standard if not explicitly mentioned _TB/_BT */
	ret = v4l2_subdev_call(sd, video, querystd, &std);		ret = v4l2_subdev_call(sd, video, g_std, &std);
	if (ret == -ENOIOCTLCMD) {		if (ret == -ENOIOCTLCMD) {
	field = V4L2_FIELD_NONE;		field = V4L2_FIELD_NONE;
	} else if (ret < 0) {		} else if (ret < 0) {