aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuninori Morimoto <morimoto.kuninori@renesas.com>2008-12-18 10:46:45 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-12-30 06:40:24 -0500
commit513791aba6266e0c15d5b697b97e956e83537f5a (patch)
tree7d09ffdc67e4ff6e218eaed8fa466fecb4158006
parent9e4a56d27f6150b0c9f8c7cc33ea944749377104 (diff)
V4L/DVB (10086): Add new set_std function on soc_camera
This patch presents new method to be able to check v4l2_std_id Signed-off-by: Kuninori Morimoto <morimoto.kuninori@renesas.com> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/soc_camera.c9
-rw-r--r--include/media/soc_camera.h1
2 files changed, 9 insertions, 1 deletions
diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c
index e869670dbae5..b12d11f213bd 100644
--- a/drivers/media/video/soc_camera.c
+++ b/drivers/media/video/soc_camera.c
@@ -152,7 +152,14 @@ static int soc_camera_s_input(struct file *file, void *priv, unsigned int i)
152 152
153static int soc_camera_s_std(struct file *file, void *priv, v4l2_std_id *a) 153static int soc_camera_s_std(struct file *file, void *priv, v4l2_std_id *a)
154{ 154{
155 return 0; 155 struct soc_camera_file *icf = file->private_data;
156 struct soc_camera_device *icd = icf->icd;
157 int ret = 0;
158
159 if (icd->ops->set_std)
160 ret = icd->ops->set_std(icd, a);
161
162 return ret;
156} 163}
157 164
158static int soc_camera_reqbufs(struct file *file, void *priv, 165static int soc_camera_reqbufs(struct file *file, void *priv,
diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h
index 8bae9a359d93..26dede82057c 100644
--- a/include/media/soc_camera.h
+++ b/include/media/soc_camera.h
@@ -165,6 +165,7 @@ struct soc_camera_ops {
165 int (*set_bus_param)(struct soc_camera_device *, unsigned long); 165 int (*set_bus_param)(struct soc_camera_device *, unsigned long);
166 int (*get_chip_id)(struct soc_camera_device *, 166 int (*get_chip_id)(struct soc_camera_device *,
167 struct v4l2_chip_ident *); 167 struct v4l2_chip_ident *);
168 int (*set_std)(struct soc_camera_device *, v4l2_std_id *);
168#ifdef CONFIG_VIDEO_ADV_DEBUG 169#ifdef CONFIG_VIDEO_ADV_DEBUG
169 int (*get_register)(struct soc_camera_device *, struct v4l2_register *); 170 int (*get_register)(struct soc_camera_device *, struct v4l2_register *);
170 int (*set_register)(struct soc_camera_device *, struct v4l2_register *); 171 int (*set_register)(struct soc_camera_device *, struct v4l2_register *);