summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorSergei Shtylyov <sergei.shtylyov@cogentembedded.com>2015-09-04 01:18:05 +0200
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-09-25 22:32:42 +0200
commitf00ae754c536511055ed6162778be8348e093514 (patch)
tree7045e8d9202d9c3fd072253bdcc45bd790ab2c48 /drivers/media
parent[media] rcar_vin: propagate querystd() error upstream (diff)
downloadlinux-f00ae754c536511055ed6162778be8348e093514.tar.xz
linux-f00ae754c536511055ed6162778be8348e093514.zip
[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>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/platform/soc_camera/rcar_vin.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/platform/soc_camera/rcar_vin.c b/drivers/media/platform/soc_camera/rcar_vin.c
index 1e277104b5fb..368ab7cfcbb4 100644
--- a/drivers/media/platform/soc_camera/rcar_vin.c
+++ b/drivers/media/platform/soc_camera/rcar_vin.c
@@ -1600,8 +1600,8 @@ static int rcar_vin_set_fmt(struct soc_camera_device *icd,
field = pix->field;
break;
case V4L2_FIELD_INTERLACED:
- /* Query for standard if not explicitly mentioned _TB/_BT */
- ret = v4l2_subdev_call(sd, video, querystd, &std);
+ /* Get the last standard if not explicitly mentioned _TB/_BT */
+ ret = v4l2_subdev_call(sd, video, g_std, &std);
if (ret == -ENOIOCTLCMD) {
field = V4L2_FIELD_NONE;
} else if (ret < 0) {