summaryrefslogtreecommitdiffstats
path: root/drivers/staging/media/omap4iss/iss_video.c
diff options
context:
space:
mode:
authorLaurent Pinchart2013-11-04 10:59:26 +0100
committerMauro Carvalho Chehab2013-12-03 20:56:23 +0100
commit16422f552d4e70fa0953917e05f72033d629bdb8 (patch)
tree0c3a1d119ac49d8e024826648b91836dee0df660 /drivers/staging/media/omap4iss/iss_video.c
parent[media] v4l: omap4iss: Move code out of mutex-protected section (diff)
downloadkernel-qcow2-linux-16422f552d4e70fa0953917e05f72033d629bdb8.tar.gz
kernel-qcow2-linux-16422f552d4e70fa0953917e05f72033d629bdb8.tar.xz
kernel-qcow2-linux-16422f552d4e70fa0953917e05f72033d629bdb8.zip
[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>
Diffstat (limited to 'drivers/staging/media/omap4iss/iss_video.c')
-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)
return 0;
}
+static int
+iss_video_s_input(struct file *file, void *fh, unsigned int input)
+{
+ return input == 0 ? 0 : -EINVAL;
+}
+
static const struct v4l2_ioctl_ops iss_video_ioctl_ops = {
.vidioc_querycap = iss_video_querycap,
.vidioc_g_fmt_vid_cap = iss_video_get_format,
@@ -923,6 +929,7 @@ static const struct v4l2_ioctl_ops iss_video_ioctl_ops = {
.vidioc_streamoff = iss_video_streamoff,
.vidioc_enum_input = iss_video_enum_input,
.vidioc_g_input = iss_video_g_input,
+ .vidioc_s_input = iss_video_s_input,
};
/* -----------------------------------------------------------------------------