summaryrefslogtreecommitdiffstats
path: root/sound/usb
diff options
context:
space:
mode:
authorAndrey Konovalov <andreyknvl@gmail.com>2016-02-13 11:08:06 +0300
committerTakashi Iwai <tiwai@suse.de>2016-02-13 09:30:58 +0100
commit07d86ca93db7e5cdf4743564d98292042ec21af7 (patch)
tree7738a3aefacb69ee6e0b380d6625043f19f01a42 /sound/usb
parent86c2ee16704522a546c0ee1e8238096e3c391468 (diff)
downloadblackbird-obmc-linux-07d86ca93db7e5cdf4743564d98292042ec21af7.tar.gz
blackbird-obmc-linux-07d86ca93db7e5cdf4743564d98292042ec21af7.zip
ALSA: usb-audio: avoid freeing umidi object twice
The 'umidi' object will be free'd on the error path by snd_usbmidi_free() when tearing down the rawmidi interface. So we shouldn't try to free it in snd_usbmidi_create() after having registered the rawmidi interface. Found by KASAN. Signed-off-by: Andrey Konovalov <andreyknvl@gmail.com> Acked-by: Clemens Ladisch <clemens@ladisch.de> Cc: <stable@vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
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 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;
}
OpenPOWER on IntegriCloud