UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[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>
This commit is contained in:
Hans Verkuil 2014-02-17 08:44:14 -03:00 committed by Mauro Carvalho Chehab
parent dc5730f5aa
commit f6cc51a9f4
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/media/platform/soc_camera/soc_camera.c
View File

@ -1277,6 +1277,8 @@ static int soc_camera_probe_finish(struct soc_camera_device *icd)
sd->grp_id = soc_camera_grp_id(icd); sd->grp_id = soc_camera_grp_id(icd);
v4l2_set_subdev_hostdata(sd, 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); ret = v4l2_ctrl_add_handler(&icd->ctrl_handler, sd->ctrl_handler, NULL);
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -1997,6 +1999,12 @@ static int soc_camera_video_start(struct soc_camera_device *icd)
return -ENODEV; return -ENODEV;
video_set_drvdata(icd->vdev, icd); 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); ret = video_register_device(icd->vdev, VFL_TYPE_GRABBER, -1);
if (ret < 0) { if (ret < 0) {
dev_err(icd->pdev, "video_register_device failed: %d\n", ret); dev_err(icd->pdev, "video_register_device failed: %d\n", ret);