summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab2015-10-01 20:48:19 +0200
committerMauro Carvalho Chehab2015-10-01 20:49:17 +0200
commitca739eb086155007d7264be7ccc07f894d5a7bbe (patch)
tree6ce9991ada74ca174bc065acd9ea031bd2e69a2f
parent[media] DocBook: Remove a warning at videobuf2-v4l2.h (diff)
downloadkernel-qcow2-linux-ca739eb086155007d7264be7ccc07f894d5a7bbe.tar.gz
kernel-qcow2-linux-ca739eb086155007d7264be7ccc07f894d5a7bbe.tar.xz
kernel-qcow2-linux-ca739eb086155007d7264be7ccc07f894d5a7bbe.zip
Revert "[media] rcar_vin: call g_std() instead of querystd()"
As pointed by Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>, this patch depends on two adv7180 patches that got rejected. This reverts commit f00ae754c536511055ed6162778be8348e093514. Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
-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 98e2593b94db..a34d1f968235 100644
--- a/drivers/media/platform/soc_camera/rcar_vin.c
+++ b/drivers/media/platform/soc_camera/rcar_vin.c
@@ -1603,8 +1603,8 @@ static int rcar_vin_set_fmt(struct soc_camera_device *icd,
field = pix->field;
break;
case V4L2_FIELD_INTERLACED:
- /* Get the last standard if not explicitly mentioned _TB/_BT */
- ret = v4l2_subdev_call(sd, video, g_std, &std);
+ /* Query for standard if not explicitly mentioned _TB/_BT */
+ ret = v4l2_subdev_call(sd, video, querystd, &std);
if (ret == -ENOIOCTLCMD) {
field = V4L2_FIELD_NONE;
} else if (ret < 0) {