From ca739eb086155007d7264be7ccc07f894d5a7bbe Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Thu, 1 Oct 2015 15:48:19 -0300 Subject: [PATCH] Revert "[media] rcar_vin: call g_std() instead of querystd()" As pointed by Sergei Shtylyov , this patch depends on two adv7180 patches that got rejected. This reverts commit f00ae754c536511055ed6162778be8348e093514. Signed-off-by: Mauro Carvalho Chehab --- drivers/media/platform/soc_camera/rcar_vin.c | 4 ++-- 1 file 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) { -- 2.20.1