From daab8acd9079f6e38856a9b60f1d861a15c7e1c8 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Tue, 18 Oct 2011 09:25:34 +0300
Subject: [PATCH] --- yaml --- r: 265147 b: refs/heads/master c:
 0f8fd43c42f2cc249943be76a4db0d058c16b6dc h: refs/heads/master i:   265145:
 28ef2f7e8856c11481f435fc5421baf214ca3658   265143:
 0136d081bec6f5c614c3e071b31d23cdfb7297ca v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/usb/gadget/f_midi.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1552fd696604..1050b79b9e24 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0889551267e7b6b4d27dc9f726f3d0cb0d976105
+refs/heads/master: 0f8fd43c42f2cc249943be76a4db0d058c16b6dc
diff --git a/trunk/drivers/usb/gadget/f_midi.c b/trunk/drivers/usb/gadget/f_midi.c
index ef1bc7a174ef..67b222908cf9 100644
--- a/trunk/drivers/usb/gadget/f_midi.c
+++ b/trunk/drivers/usb/gadget/f_midi.c
@@ -951,7 +951,7 @@ int __init f_midi_bind_config(struct usb_configuration *c,
 		struct gmidi_in_port *port = kzalloc(sizeof(*port), GFP_KERNEL);
 		if (!port) {
 			status = -ENOMEM;
-			goto fail;
+			goto setup_fail;
 		}
 
 		port->midi = midi;
@@ -989,6 +989,8 @@ int __init f_midi_bind_config(struct usb_configuration *c,
 	return 0;
 
 setup_fail:
+	for (--i; i >= 0; i--)
+		kfree(midi->in_port[i]);
 	kfree(midi);
 fail:
 	return status;