diff options
| author | Kees Cook | 2017-10-17 01:10:36 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2017-10-27 17:38:54 +0200 |
| commit | 7dc31b82dd5da5eb596f9091b67326742135732c (patch) | |
| tree | 7f936227e284a7029a2ee029254db0b10fb99575 /drivers/media | |
| parent | media: imon: Fix null-ptr-deref in imon_probe (diff) | |
| download | kernel-qcow2-linux-7dc31b82dd5da5eb596f9091b67326742135732c.tar.gz kernel-qcow2-linux-7dc31b82dd5da5eb596f9091b67326742135732c.tar.xz kernel-qcow2-linux-7dc31b82dd5da5eb596f9091b67326742135732c.zip | |
media: serial_ir: 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.
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/rc/serial_ir.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/rc/serial_ir.c b/drivers/media/rc/serial_ir.c index 8b66926bc16a..8bf5637b3a69 100644 --- a/drivers/media/rc/serial_ir.c +++ b/drivers/media/rc/serial_ir.c @@ -470,7 +470,7 @@ static int hardware_init_port(void) return 0; } -static void serial_ir_timeout(unsigned long arg) +static void serial_ir_timeout(struct timer_list *unused) { DEFINE_IR_RAW_EVENT(ev); @@ -540,8 +540,7 @@ static int serial_ir_probe(struct platform_device *dev) serial_ir.rcdev = rcdev; - setup_timer(&serial_ir.timeout_timer, serial_ir_timeout, - (unsigned long)&serial_ir); + timer_setup(&serial_ir.timeout_timer, serial_ir_timeout, 0); result = devm_request_irq(&dev->dev, irq, serial_ir_irq_handler, share_irq ? IRQF_SHARED : 0, |