aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/soc_camera.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/soc_camera.c')
-rw-r--r--drivers/media/video/soc_camera.c17
1 files changed, 5 insertions, 12 deletions
diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c
index 4e4d4122d9a..136326e8c4b 100644
--- a/drivers/media/video/soc_camera.c
+++ b/drivers/media/video/soc_camera.c
@@ -199,22 +199,15 @@ static int soc_camera_try_fmt_vid_cap(struct file *file, void *priv,
199static int soc_camera_enum_input(struct file *file, void *priv, 199static int soc_camera_enum_input(struct file *file, void *priv,
200 struct v4l2_input *inp) 200 struct v4l2_input *inp)
201{ 201{
202 struct soc_camera_device *icd = file->private_data;
203 int ret = 0;
204
205 if (inp->index != 0) 202 if (inp->index != 0)
206 return -EINVAL; 203 return -EINVAL;
207 204
208 if (icd->ops->enum_input) 205 /* default is camera */
209 ret = icd->ops->enum_input(icd, inp); 206 inp->type = V4L2_INPUT_TYPE_CAMERA;
210 else { 207 inp->std = V4L2_STD_UNKNOWN;
211 /* default is camera */ 208 strcpy(inp->name, "Camera");
212 inp->type = V4L2_INPUT_TYPE_CAMERA;
213 inp->std = V4L2_STD_UNKNOWN;
214 strcpy(inp->name, "Camera");
215 }
216 209
217 return ret; 210 return 0;
218} 211}
219 212
220static int soc_camera_g_input(struct file *file, void *priv, unsigned int *i) 213static int soc_camera_g_input(struct file *file, void *priv, unsigned int *i)