diff options
| author | Guennadi Liakhovetski | 2009-08-25 11:46:51 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2009-09-19 00:18:53 -0300 |
| commit | a12222a73e7a9efd927eb99d1dec1cedc9887e0a (patch) | |
| tree | cc46e7f54159ec8652d9f7b2b0d694c135e5886e /drivers | |
| parent | cca0e54905259a456d97652d4f1e2fe8b188b6ad (diff) | |
V4L/DVB (12521): soc-camera: use .s_std() from struct v4l2_subdev_core_ops
Remove .set_std() method from struct soc_camera_ops, use .s_std() from
struct v4l2_subdev_core_ops instead.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/video/soc_camera.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c index aa6614b60d6f..44a94dc934f8 100644 --- a/drivers/media/video/soc_camera.c +++ b/drivers/media/video/soc_camera.c @@ -152,12 +152,9 @@ static int soc_camera_s_std(struct file *file, void *priv, v4l2_std_id *a) { struct soc_camera_file *icf = file->private_data; struct soc_camera_device *icd = icf->icd; - int ret = 0; - - if (icd->ops->set_std) - ret = icd->ops->set_std(icd, a); + struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent); - return ret; + return v4l2_device_call_until_err(&ici->v4l2_dev, (__u32)icd, core, s_std, *a); } static int soc_camera_reqbufs(struct file *file, void *priv, |