projects/linux·commit b4e4334d

Merge tag 'sound-fix-4.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

b4e4334d · Linus Torvalds <[email protected]> · 2016-02-13 13:04:47 -08:00

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
Commit
b4e4334d7bea8992bc8525763b5b4f34e89c520b
Parents
e835a65f · 07d86ca9

Merge commit. Changes below are compared with the first parent: e835a65f.

Changes

1 files changed · +0 −1

FileStatusAddDelContent
sound/usb/midi.cmodified+0−1View file

sound/usb/midi.c

View file
diff --git a/sound/usb/midi.c b/sound/usb/midi.c
index cc39f63..007cf58 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;
}