aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2013-11-04 04:59:26 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-12-03 14:56:23 -0500
commit16422f552d4e70fa0953917e05f72033d629bdb8 (patch)
tree0c3a1d119ac49d8e024826648b91836dee0df660
parentc3dbc70d825968da10cf6fdde40447aeec632a2d (diff)
[media] v4l: omap4iss: Implement VIDIOC_S_INPUT
The ioctl is (at least currently) mandatory. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Acked-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/staging/media/omap4iss/iss_video.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/staging/media/omap4iss/iss_video.c b/drivers/staging/media/omap4iss/iss_video.c
index 68006231cc41..766491e6a8d0 100644
--- a/drivers/staging/media/omap4iss/iss_video.c
+++ b/drivers/staging/media/omap4iss/iss_video.c
@@ -902,6 +902,12 @@ iss_video_g_input(struct file *file, void *fh, unsigned int *input)
902 return 0; 902 return 0;
903} 903}
904 904
905static int
906iss_video_s_input(struct file *file, void *fh, unsigned int input)
907{
908 return input == 0 ? 0 : -EINVAL;
909}
910
905static const struct v4l2_ioctl_ops iss_video_ioctl_ops = { 911static const struct v4l2_ioctl_ops iss_video_ioctl_ops = {
906 .vidioc_querycap = iss_video_querycap, 912 .vidioc_querycap = iss_video_querycap,
907 .vidioc_g_fmt_vid_cap = iss_video_get_format, 913 .vidioc_g_fmt_vid_cap = iss_video_get_format,
@@ -923,6 +929,7 @@ static const struct v4l2_ioctl_ops iss_video_ioctl_ops = {
923 .vidioc_streamoff = iss_video_streamoff, 929 .vidioc_streamoff = iss_video_streamoff,
924 .vidioc_enum_input = iss_video_enum_input, 930 .vidioc_enum_input = iss_video_enum_input,
925 .vidioc_g_input = iss_video_g_input, 931 .vidioc_g_input = iss_video_g_input,
932 .vidioc_s_input = iss_video_s_input,
926}; 933};
927 934
928/* ----------------------------------------------------------------------------- 935/* -----------------------------------------------------------------------------