2 files changed, 14 insertions, 4 deletions

diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c
index b12d11f213bd..e86e6bda1b7f 100644
--- a/drivers/media/video/soc_camera.c
+++ b/drivers/media/video/soc_camera.c
@@ -125,14 +125,23 @@ static int soc_camera_try_fmt_vid_cap(struct file *file, void *priv,
 static int soc_camera_enum_input(struct file *file, void *priv,
                                  struct v4l2_input *inp)
 {
+        struct soc_camera_file *icf = file->private_data;
+        struct soc_camera_device *icd = icf->icd;
+        int ret = 0;
+
         if (inp->index != 0)
                 return -EINVAL;
 
-        inp->type = V4L2_INPUT_TYPE_CAMERA;
-        inp->std = V4L2_STD_UNKNOWN;
-        strcpy(inp->name, "Camera");
+        if (icd->ops->enum_input)
+                ret = icd->ops->enum_input(icd, inp);
+        else {
+                /* default is camera */
+                inp->type = V4L2_INPUT_TYPE_CAMERA;
+                inp->std  = V4L2_STD_UNKNOWN;
+                strcpy(inp->name, "Camera");
+        }
 
-        return 0;
+        return ret;
 }
 
 static int soc_camera_g_input(struct file *file, void *priv, unsigned int *i)
diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h
index 26dede82057c..50f4447566de 100644
--- a/include/media/soc_camera.h
+++ b/include/media/soc_camera.h
@@ -166,6 +166,7 @@ struct soc_camera_ops {
         int (*get_chip_id)(struct soc_camera_device *,
                            struct v4l2_chip_ident *);
         int (*set_std)(struct soc_camera_device *, v4l2_std_id *);
+        int (*enum_input)(struct soc_camera_device *, struct v4l2_input *);
 #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 *);