diff options
-rw-r--r-- | drivers/media/video/soc_camera.c | 9 | ||||
-rw-r--r-- | include/media/soc_camera.h | 1 |
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 | ||
153 | static int soc_camera_s_std(struct file *file, void *priv, v4l2_std_id *a) | 153 | static 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 | ||
158 | static int soc_camera_reqbufs(struct file *file, void *priv, | 165 | static 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 *); |