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)
 
 static int soc_camera_s_std(struct file *file, void *priv, v4l2_std_id *a)
 {
-        return 0;
+        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);
+
+        return ret;
 }
 
 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 {
         int (*set_bus_param)(struct soc_camera_device *, unsigned long);
         int (*get_chip_id)(struct soc_camera_device *,
                            struct v4l2_chip_ident *);
+        int (*set_std)(struct soc_camera_device *, v4l2_std_id *);
 #ifdef CONFIG_VIDEO_ADV_DEBUG
         int (*get_register)(struct soc_camera_device *, struct v4l2_register *);
         int (*set_register)(struct soc_camera_device *, struct v4l2_register *);