1 files changed, 1 insertions, 3 deletions

diff --git a/drivers/media/usb/s2255/s2255drv.c b/drivers/media/usb/s2255/s2255drv.c
index de55e96fed15..0f3c34d47ec3 100644
--- a/drivers/media/usb/s2255/s2255drv.c
+++ b/drivers/media/usb/s2255/s2255drv.c
@@ -2274,9 +2274,7 @@ static int s2255_probe(struct usb_interface *interface,
                 dev_err(&interface->dev, "Could not find bulk-in endpoint\n");
                 goto errorEP;
         }
-        init_timer(&dev->timer);
-        dev->timer.function = s2255_timer;
-        dev->timer.data = (unsigned long)dev->fw_data;
+        setup_timer(&dev->timer, s2255_timer, (unsigned long)dev->fw_data);
         init_waitqueue_head(&dev->fw_data->wait_fw);
         for (i = 0; i < MAX_CHANNELS; i++) {
                 struct s2255_vc *vc = &dev->vc[i];