diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-13 13:04:47 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-13 13:04:47 -0800 |
| commit | b4e4334d7bea8992bc8525763b5b4f34e89c520b (patch) | |
| tree | 8502b81bed9fb6aa7afaeb93644f5c1db846c898 | |
| parent | Merge tag 'arc-4.5-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc (diff) | |
| parent | ALSA: usb-audio: avoid freeing umidi object twice (diff) | |
| download | wireguard-linux-b4e4334d7bea8992bc8525763b5b4f34e89c520b.tar.xz wireguard-linux-b4e4334d7bea8992bc8525763b5b4f34e89c520b.zip | |
Merge tag 'sound-fix-4.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull another sound fix from Takashi Iwai:
"This contains a fix for the double-free of usb-audio MIDI device at
probe failure"
* tag 'sound-fix-4.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ALSA: usb-audio: avoid freeing umidi object twice
| -rw-r--r-- | sound/usb/midi.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/usb/midi.c b/sound/usb/midi.c index cc39f63299ef..007cf5831121 100644 --- a/sound/usb/midi.c +++ b/sound/usb/midi.c @@ -2455,7 +2455,6 @@ int snd_usbmidi_create(struct snd_card *card, else err = snd_usbmidi_create_endpoints(umidi, endpoints); if (err < 0) { - snd_usbmidi_free(umidi); return err; } |