diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2011-03-12 08:54:43 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-07-27 17:53:17 -0300 |
| commit | 2d28b686adc18567b388362e1f7b86658cfd81fc (patch) | |
| tree | 233ac5fb1aeb920cb0539719b1761c01ad109049 /drivers/media/video/v4l2-fh.c | |
| parent | 7ebbc39fa0b469243b985e5e26755f1e6184213f (diff) | |
| download | blackbird-op-linux-2d28b686adc18567b388362e1f7b86658cfd81fc.tar.gz blackbird-op-linux-2d28b686adc18567b388362e1f7b86658cfd81fc.zip | |
[media] v4l2-ioctl: add ctrl_handler to v4l2_fh
This is required to implement control events and is also needed to allow
for per-filehandle control handlers.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/v4l2-fh.c')
| -rw-r--r-- | drivers/media/video/v4l2-fh.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/video/v4l2-fh.c b/drivers/media/video/v4l2-fh.c index 717f71e6370e..863501194d04 100644 --- a/drivers/media/video/v4l2-fh.c +++ b/drivers/media/video/v4l2-fh.c @@ -32,6 +32,8 @@ int v4l2_fh_init(struct v4l2_fh *fh, struct video_device *vdev) { fh->vdev = vdev; + /* Inherit from video_device. May be overridden by the driver. */ + fh->ctrl_handler = vdev->ctrl_handler; INIT_LIST_HEAD(&fh->list); set_bit(V4L2_FL_USES_V4L2_FH, &fh->vdev->flags); fh->prio = V4L2_PRIORITY_UNSET; |
