From 858fccd9aacf39bc714649f8847b83140b7d3cca Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jj@chaosbits.net>
Date: Thu, 1 Mar 2012 23:01:19 +0100
Subject: [PATCH] --- yaml --- r: 289646 b: refs/heads/master c:
 2a5be8783e0016d15e7907ddd212b2c312e196eb h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 0a9405eb5d43..9aac75ac65f3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b1443ac0e486842c133b8805ee035ab3ff918763
+refs/heads/master: 2a5be8783e0016d15e7907ddd212b2c312e196eb
diff --git a/trunk/drivers/usb/gadget/f_midi.c b/trunk/drivers/usb/gadget/f_midi.c
index 3797b3d6c622..2f7e8f2930cc 100644
--- a/trunk/drivers/usb/gadget/f_midi.c
+++ b/trunk/drivers/usb/gadget/f_midi.c
@@ -780,7 +780,7 @@ f_midi_bind(struct usb_configuration *c, struct usb_function *f)
 	midi->out_ep->driver_data = cdev;	/* claim */
 
 	/* allocate temporary function list */
-	midi_function = kcalloc((MAX_PORTS * 4) + 9, sizeof(midi_function),
+	midi_function = kcalloc((MAX_PORTS * 4) + 9, sizeof(*midi_function),
 				GFP_KERNEL);
 	if (!midi_function) {
 		status = -ENOMEM;