diff options
| author | Kees Cook <keescook@chromium.org> | 2017-10-16 19:10:12 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2017-10-31 06:38:53 -0400 |
| commit | 3e3149173fd831e554f45c694e5349370601dd5f (patch) | |
| tree | 377b59dcf4ef46b1844facf90b13e73b343d0573 /include/media/drv-intf | |
| parent | 82fad4762565ccae181c2d5ee332d47456e6ed7f (diff) | |
| download | blackbird-obmc-linux-3e3149173fd831e554f45c694e5349370601dd5f.tar.gz blackbird-obmc-linux-3e3149173fd831e554f45c694e5349370601dd5f.zip | |
media: media/saa7146: Convert timers to use timer_setup()
In preparation for unconditionally passing the struct timer_list pointer to
all timer callbacks, switch to using the new timer_setup() and from_timer()
to pass the timer pointer explicitly. This requires adding a pointer to
hold the timer's target file, as there won't be a way to pass this in the
future.
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'include/media/drv-intf')
| -rw-r--r-- | include/media/drv-intf/saa7146_vv.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/media/drv-intf/saa7146_vv.h b/include/media/drv-intf/saa7146_vv.h index 736f4f2d8290..926c5b145279 100644 --- a/include/media/drv-intf/saa7146_vv.h +++ b/include/media/drv-intf/saa7146_vv.h @@ -107,6 +107,7 @@ struct saa7146_vv struct saa7146_dmaqueue vbi_dmaq; struct v4l2_vbi_format vbi_fmt; struct timer_list vbi_read_timeout; + struct file *vbi_read_timeout_file; /* vbi workaround interrupt queue */ wait_queue_head_t vbi_wq; int vbi_fieldcount; |
