aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa6588.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/saa6588.c')
-rw-r--r--drivers/media/video/saa6588.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/saa6588.c b/drivers/media/video/saa6588.c
index a81285ca7d5b..8ba05c214ca7 100644
--- a/drivers/media/video/saa6588.c
+++ b/drivers/media/video/saa6588.c
@@ -322,9 +322,9 @@ static void saa6588_timer(unsigned long data)
322 schedule_work(&s->work); 322 schedule_work(&s->work);
323} 323}
324 324
325static void saa6588_work(void *data) 325static void saa6588_work(struct work_struct *work)
326{ 326{
327 struct saa6588 *s = (struct saa6588 *)data; 327 struct saa6588 *s = container_of(work, struct saa6588, work);
328 328
329 saa6588_i2c_poll(s); 329 saa6588_i2c_poll(s);
330 mod_timer(&s->timer, jiffies + msecs_to_jiffies(20)); 330 mod_timer(&s->timer, jiffies + msecs_to_jiffies(20));
@@ -417,7 +417,7 @@ static int saa6588_attach(struct i2c_adapter *adap, int addr, int kind)
417 saa6588_configure(s); 417 saa6588_configure(s);
418 418
419 /* start polling via eventd */ 419 /* start polling via eventd */
420 INIT_WORK(&s->work, saa6588_work, s); 420 INIT_WORK(&s->work, saa6588_work);
421 init_timer(&s->timer); 421 init_timer(&s->timer);
422 s->timer.function = saa6588_timer; 422 s->timer.function = saa6588_timer;
423 s->timer.data = (unsigned long)s; 423 s->timer.data = (unsigned long)s;