diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-01-20 10:11:27 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-01-20 10:11:27 +0100 |
| commit | 3b15d0d505de859908ba2a6959db59c0aed6910a (patch) | |
| tree | aecdc0fa9d6d4935d40e2eaed0ff5c202d4c4da6 /sound/usb | |
| parent | 86b5f3ec41b5798811ec488fda4865a9781ec8ef (diff) | |
| parent | 28e237a9b7bc45d048ba7cb683ab348701e099fd (diff) | |
| download | op-kernel-dev-3b15d0d505de859908ba2a6959db59c0aed6910a.zip op-kernel-dev-3b15d0d505de859908ba2a6959db59c0aed6910a.tar.gz | |
Merge branch 'topic/timer-cleanup' into for-next
Diffstat (limited to 'sound/usb')
| -rw-r--r-- | sound/usb/midi.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/usb/midi.c b/sound/usb/midi.c index 5bfb695..417ebb1 100644 --- a/sound/usb/midi.c +++ b/sound/usb/midi.c @@ -2292,14 +2292,13 @@ int snd_usbmidi_create(struct snd_card *card, umidi->iface = iface; umidi->quirk = quirk; umidi->usb_protocol_ops = &snd_usbmidi_standard_ops; - init_timer(&umidi->error_timer); spin_lock_init(&umidi->disc_lock); init_rwsem(&umidi->disc_rwsem); mutex_init(&umidi->mutex); umidi->usb_id = USB_ID(le16_to_cpu(umidi->dev->descriptor.idVendor), le16_to_cpu(umidi->dev->descriptor.idProduct)); - umidi->error_timer.function = snd_usbmidi_error_timer; - umidi->error_timer.data = (unsigned long)umidi; + setup_timer(&umidi->error_timer, snd_usbmidi_error_timer, + (unsigned long)umidi); /* detect the endpoint(s) to use */ memset(endpoints, 0, sizeof(endpoints)); |
