|
|
@@ -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];
|