Some v4l-subdevs such as tvp5150 have multiple inputs. This patch allows the user of a soc-camera device to select between them. Signed-off-by: Javier Martin <javier.martin@xxxxxxxxxxxxxxxxx> --- drivers/media/video/soc_camera.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c index b72580c..1cea1a9 100644 --- a/drivers/media/video/soc_camera.c +++ b/drivers/media/video/soc_camera.c @@ -235,10 +235,10 @@ static int soc_camera_g_input(struct file *file, void *priv, unsigned int *i) static int soc_camera_s_input(struct file *file, void *priv, unsigned int i) { - if (i > 0) - return -EINVAL; + struct soc_camera_device *icd = file->private_data; + struct v4l2_subdev *sd = soc_camera_to_subdev(icd); - return 0; + return v4l2_subdev_call(sd, video, s_routing, i, 0, 0); } static int soc_camera_s_std(struct file *file, void *priv, v4l2_std_id *a) -- 1.7.0.4 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html