[media] soc_camera: disable STD ioctls if no tvnorms are set

If the sub-device did not report any tvnorms, then disable the STD
ioctls.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Tested-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

diff --git a/drivers/media/platform/soc_camera/soc_camera.c b/drivers/media/platform/soc_camera/soc_camera.c
index 4b8c024fc487d3267bd905a0b42533b26e5975f3..c8549bf3213b1a95695289159853e9fcf56080de 100644 (file)
--- a/drivers/media/platform/soc_camera/soc_camera.c
+++ b/drivers/media/platform/soc_camera/soc_camera.c
@@ -1277,6 +1277,8 @@ static int soc_camera_probe_finish(struct soc_camera_device *icd)
        sd->grp_id = soc_camera_grp_id(icd);
        v4l2_set_subdev_hostdata(sd, icd);
 
+       v4l2_subdev_call(sd, video, g_tvnorms, &icd->vdev->tvnorms);
+
        ret = v4l2_ctrl_add_handler(&icd->ctrl_handler, sd->ctrl_handler, NULL);
        if (ret < 0)
                return ret;
@@ -1997,6 +1999,12 @@ static int soc_camera_video_start(struct soc_camera_device *icd)
                return -ENODEV;
 
        video_set_drvdata(icd->vdev, icd);
+       if (icd->vdev->tvnorms == 0) {
+               /* disable the STD API if there are no tvnorms defined */
+               v4l2_disable_ioctl(icd->vdev, VIDIOC_G_STD);
+               v4l2_disable_ioctl(icd->vdev, VIDIOC_S_STD);
+               v4l2_disable_ioctl(icd->vdev, VIDIOC_ENUMSTD);
+       }
        ret = video_register_device(icd->vdev, VFL_TYPE_GRABBER, -1);
        if (ret < 0) {
                dev_err(icd->pdev, "video_register_device failed: %d\n", ret);