diff options
Diffstat (limited to 'sound/usb')
-rw-r--r-- | sound/usb/line6/toneport.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sound/usb/line6/toneport.c b/sound/usb/line6/toneport.c index e5669bd3233a..fb6d5e1e2ade 100644 --- a/sound/usb/line6/toneport.c +++ b/sound/usb/line6/toneport.c | |||
@@ -360,6 +360,8 @@ static void toneport_setup(struct usb_line6_toneport *toneport) | |||
360 | 360 | ||
361 | if (toneport_has_led(toneport->type)) | 361 | if (toneport_has_led(toneport->type)) |
362 | toneport_update_led(&usbdev->dev); | 362 | toneport_update_led(&usbdev->dev); |
363 | |||
364 | mod_timer(&toneport->timer, jiffies + TONEPORT_PCM_DELAY * HZ); | ||
363 | } | 365 | } |
364 | 366 | ||
365 | /* | 367 | /* |
@@ -390,6 +392,9 @@ static int toneport_init(struct usb_interface *interface, | |||
390 | int err; | 392 | int err; |
391 | struct usb_line6_toneport *toneport = (struct usb_line6_toneport *) line6; | 393 | struct usb_line6_toneport *toneport = (struct usb_line6_toneport *) line6; |
392 | 394 | ||
395 | setup_timer(&toneport->timer, toneport_start_pcm, | ||
396 | (unsigned long)toneport); | ||
397 | |||
393 | line6->disconnect = line6_toneport_disconnect; | 398 | line6->disconnect = line6_toneport_disconnect; |
394 | 399 | ||
395 | /* initialize PCM subsystem: */ | 400 | /* initialize PCM subsystem: */ |
@@ -435,10 +440,6 @@ static int toneport_init(struct usb_interface *interface, | |||
435 | 440 | ||
436 | toneport_setup(toneport); | 441 | toneport_setup(toneport); |
437 | 442 | ||
438 | setup_timer(&toneport->timer, toneport_start_pcm, | ||
439 | (unsigned long)toneport); | ||
440 | mod_timer(&toneport->timer, jiffies + TONEPORT_PCM_DELAY * HZ); | ||
441 | |||
442 | /* register audio system: */ | 443 | /* register audio system: */ |
443 | return snd_card_register(line6->card); | 444 | return snd_card_register(line6->card); |
444 | } | 445 | } |