Merge remote-tracking branch 'staging/staging-next'

[deliverable/linux.git] / drivers / staging / i4l / pcbit / layer2.c

diff --git a/drivers/staging/i4l/pcbit/layer2.c b/drivers/staging/i4l/pcbit/layer2.c
index 46e1240ae0741a54008a976602b11a90f00ea685..a136c72547e5c740c8c2bf891c35685810e49982 100644 (file)
--- a/drivers/staging/i4l/pcbit/layer2.c
+++ b/drivers/staging/i4l/pcbit/layer2.c
@@ -645,11 +645,9 @@ pcbit_l2_error(struct pcbit_dev *dev)
 
                dev->l2_state = L2_DOWN;
 
-               init_timer(&dev->error_recover_timer);
-               dev->error_recover_timer.function = &pcbit_l2_err_recover;
-               dev->error_recover_timer.data = (ulong) dev;
-               dev->error_recover_timer.expires = jiffies + ERRTIME;
-               add_timer(&dev->error_recover_timer);
+               setup_timer(&dev->error_recover_timer, &pcbit_l2_err_recover,
+                           (ulong)dev);
+               mod_timer(&dev->error_recover_timer, jiffies + ERRTIME);
        }
 }