From f8b6175a163da9ef6dc7db88b7d3717409b910bc Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Mon, 24 Oct 2011 23:41:37 +0200 Subject: [PATCH] --- yaml --- r: 280972 b: refs/heads/master c: 982d6ab50115025c63f4b9f7175614008c41d449 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/line6/midi.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a3ad1810880f..e6e2feb546e9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6f37aca827e6d075c9e9d3ab1b233cce2a3bc9f1 +refs/heads/master: 982d6ab50115025c63f4b9f7175614008c41d449 diff --git a/trunk/drivers/staging/line6/midi.c b/trunk/drivers/staging/line6/midi.c index e554a2da643a..86c50cf9b2a7 100644 --- a/trunk/drivers/staging/line6/midi.c +++ b/trunk/drivers/staging/line6/midi.c @@ -391,12 +391,17 @@ int line6_init_midi(struct usb_line6 *line6) return -ENOMEM; err = line6_midibuf_init(&line6midi->midibuf_in, MIDI_BUFFER_SIZE, 0); - if (err < 0) + if (err < 0) { + kfree(line6midi); return err; + } err = line6_midibuf_init(&line6midi->midibuf_out, MIDI_BUFFER_SIZE, 1); - if (err < 0) + if (err < 0) { + kfree(line6midi->midibuf_in.buf); + kfree(line6midi); return err; + } line6midi->line6 = line6; line6midi->midi_mask_transmit = 1;