Commit b4e4334d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents e835a65f 07d86ca9

sound/usb/midi.c

+0 −1
Original line number Diff line number Diff line
@@ -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;

	}