From 6540c0779656b0aa9d50918a33c68b0daeb210d4 Mon Sep 17 00:00:00 2001 From: Guennadi Liakhovetski Date: Tue, 25 Aug 2009 11:46:51 -0300 Subject: [PATCH] --- yaml --- r: 164224 b: refs/heads/master c: a12222a73e7a9efd927eb99d1dec1cedc9887e0a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/soc_camera.c | 7 ++----- trunk/include/media/soc_camera.h | 1 - 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 8368d3412d4e..02bf2ddaea25 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cca0e54905259a456d97652d4f1e2fe8b188b6ad +refs/heads/master: a12222a73e7a9efd927eb99d1dec1cedc9887e0a diff --git a/trunk/drivers/media/video/soc_camera.c b/trunk/drivers/media/video/soc_camera.c index aa6614b60d6f..44a94dc934f8 100644 --- a/trunk/drivers/media/video/soc_camera.c +++ b/trunk/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, diff --git a/trunk/include/media/soc_camera.h b/trunk/include/media/soc_camera.h index 2b7a8c663605..7c44d4016561 100644 --- a/trunk/include/media/soc_camera.h +++ b/trunk/include/media/soc_camera.h @@ -190,7 +190,6 @@ struct soc_camera_ops { int (*set_bus_param)(struct soc_camera_device *, unsigned long); int (*get_chip_id)(struct soc_camera_device *, struct v4l2_dbg_chip_ident *); - int (*set_std)(struct soc_camera_device *, v4l2_std_id *); int (*enum_input)(struct soc_camera_device *, struct v4l2_input *); const struct v4l2_queryctrl *controls; int num_controls;