aboutsummaryrefslogtreecommitdiffstats
path: root/sound/usb
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2016-02-26 20:26:09 +0100
committerTakashi Iwai <tiwai@suse.de>2016-02-26 20:26:09 +0100
commitd61b04f801e6005182d432ebe4a0211c1d6feadd (patch)
treeaa085e56e1be528917212f41c485eebdfc072930 /sound/usb
parentALSA: hda - Autosuspend controller after probe even if codecs are already suspended (diff)
parentALSA: hda - Loop interrupt handling until really cleared (diff)
downloadlinux-dev-d61b04f801e6005182d432ebe4a0211c1d6feadd.tar.xz
linux-dev-d61b04f801e6005182d432ebe4a0211c1d6feadd.zip
Merge branch 'for-linus' into for-next
Diffstat (limited to 'sound/usb')
-rw-r--r--sound/usb/midi.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/usb/midi.c b/sound/usb/midi.c
index b79875ebec1e..47de8af42f16 100644
--- 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;
}