OSDN Git Service

[media] media/i2c/tc358743: Initialize timer
authorKees Cook <keescook@chromium.org>
Wed, 20 Sep 2017 23:27:41 +0000 (20:27 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Wed, 4 Oct 2017 19:59:47 +0000 (16:59 -0300)
This converts to use setup_timer() to set callback and data, though it
doesn't look like this would have worked with timer checking enabled
since no init_timer() was ever called before.

Cc: Mats Randgaard <matrandg@cisco.com>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
drivers/media/i2c/tc358743.c

index e1d8eef..a935503 100644 (file)
@@ -2147,8 +2147,8 @@ static int tc358743_probe(struct i2c_client *client,
        } else {
                INIT_WORK(&state->work_i2c_poll,
                          tc358743_work_i2c_poll);
-               state->timer.data = (unsigned long)state;
-               state->timer.function = tc358743_irq_poll_timer;
+               setup_timer(&state->timer, tc358743_irq_poll_timer,
+                           (unsigned long)state);
                state->timer.expires = jiffies +
                                       msecs_to_jiffies(POLL_INTERVAL_MS);
                add_timer(&state->timer);