Merge branch 'for-linus' into for-next

2016-02-26 20:26:09 +01:00
parent 30ff5957c3 473f414564
commit d61b04f801
38 changed files with 331 additions and 192 deletions
--- a/sound/usb/midi.c
+++ b/sound/usb/midi.c
@@ -2458,7 +2458,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;
 	}