Skip to content

Commit

Permalink
[media] V4L: soc-camera: camera client operations no longer compulsory
Browse files Browse the repository at this point in the history
With the transition of all soc-camera host drivers to use V4L2
subdevice .[gs]_mbus_config() operations, soc-camera client operations
no longer have to be compulsory.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Guennadi Liakhovetski authored and Mauro Carvalho Chehab committed Nov 3, 2011
1 parent e1db704 commit b0050e4
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions drivers/media/video/soc_camera.c
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@ static int soc_camera_open(struct file *file)
struct soc_camera_host *ici;
int ret;

if (!icd->ops)
if (!to_soc_camera_control(icd))
/* No device driver attached */
return -ENODEV;

Expand Down Expand Up @@ -835,6 +835,9 @@ static int soc_camera_queryctrl(struct file *file, void *priv,
return 0;
}

if (!icd->ops)
return -EINVAL;

/* Then device controls */
for (i = 0; i < icd->ops->num_controls; i++)
if (qc->id == icd->ops->controls[i].id) {
Expand Down Expand Up @@ -1461,11 +1464,6 @@ static int soc_camera_video_start(struct soc_camera_device *icd)
if (!icd->parent)
return -ENODEV;

if (!icd->ops ||
!icd->ops->query_bus_param ||
!icd->ops->set_bus_param)
return -EINVAL;

ret = video_register_device(icd->vdev, VFL_TYPE_GRABBER, -1);
if (ret < 0) {
dev_err(icd->pdev, "video_register_device failed: %d\n", ret);
Expand Down

0 comments on commit b0050e4

Please sign in to comment.