diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2011-06-13 17:44:42 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-07-27 17:53:31 -0300 |
| commit | 523f46d6aba9dcb0a2d0fc474ca884e93a7cf198 (patch) | |
| tree | 5c73cecf3d9786868ac03c93f7df2df6a465d9a6 /drivers/media/video/vivi.c | |
| parent | 95904d4b6a188ea2f0f1781498f6ca626e21b9ac (diff) | |
| download | linux-3.10-523f46d6aba9dcb0a2d0fc474ca884e93a7cf198.tar.gz linux-3.10-523f46d6aba9dcb0a2d0fc474ca884e93a7cf198.tar.bz2 linux-3.10-523f46d6aba9dcb0a2d0fc474ca884e93a7cf198.zip | |
[media] v4l2-events/fh: merge v4l2_events into v4l2_fh
Drivers that supported events used to be rare, but now that controls can also
raise events this will become much more common since almost all drivers have
controls.
This means that keeping struct v4l2_events as a separate struct make no more
sense. Merging it into struct v4l2_fh simplifies things substantially as it
is now an integral part of the filehandle struct.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/vivi.c')
| -rw-r--r-- | drivers/media/video/vivi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c index e81c10607bb..1b90713b44c 100644 --- a/drivers/media/video/vivi.c +++ b/drivers/media/video/vivi.c @@ -1046,7 +1046,7 @@ vivi_poll(struct file *file, struct poll_table_struct *wait) if (v4l2_event_pending(fh)) res |= POLLPRI; else - poll_wait(file, &fh->events->wait, wait); + poll_wait(file, &fh->wait, wait); return res; } |