diff options
| author | Hans Verkuil | 2015-03-05 17:05:24 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2015-05-01 12:42:58 +0200 |
| commit | 87d184300d6c50050b88d2d8a3aaab11eaa0c872 (patch) | |
| tree | ec0db28689b228207b2aa6bcdc2ab5d7184010e7 /drivers/media/platform/marvell-ccic | |
| parent | [media] marvell-ccic: switch to struct v4l2_fh (diff) | |
| download | kernel-qcow2-linux-87d184300d6c50050b88d2d8a3aaab11eaa0c872.tar.gz kernel-qcow2-linux-87d184300d6c50050b88d2d8a3aaab11eaa0c872.tar.xz kernel-qcow2-linux-87d184300d6c50050b88d2d8a3aaab11eaa0c872.zip | |
[media] marvell-ccic: implement control events
Now that this driver uses v4l2_fh, it is trivial to add support for
control events. Again, this fixes a v4l2-compliance failure.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/platform/marvell-ccic')
| -rw-r--r-- | drivers/media/platform/marvell-ccic/mcam-core.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/platform/marvell-ccic/mcam-core.c b/drivers/media/platform/marvell-ccic/mcam-core.c index 8456017043d4..4d501823ede1 100644 --- a/drivers/media/platform/marvell-ccic/mcam-core.c +++ b/drivers/media/platform/marvell-ccic/mcam-core.c @@ -24,6 +24,7 @@ #include <media/v4l2-device.h> #include <media/v4l2-ioctl.h> #include <media/v4l2-ctrls.h> +#include <media/v4l2-event.h> #include <media/ov7670.h> #include <media/videobuf2-vmalloc.h> #include <media/videobuf2-dma-contig.h> @@ -1665,6 +1666,8 @@ static const struct v4l2_ioctl_ops mcam_v4l_ioctl_ops = { .vidioc_s_parm = mcam_vidioc_s_parm, .vidioc_enum_framesizes = mcam_vidioc_enum_framesizes, .vidioc_enum_frameintervals = mcam_vidioc_enum_frameintervals, + .vidioc_subscribe_event = v4l2_ctrl_subscribe_event, + .vidioc_unsubscribe_event = v4l2_event_unsubscribe, #ifdef CONFIG_VIDEO_ADV_DEBUG .vidioc_g_register = mcam_vidioc_g_register, .vidioc_s_register = mcam_vidioc_s_register, |