From 501792ddcefcf87486a3bf61e814d287693fe727 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi.denis-courmont@nokia.com>
Date: Mon, 1 Jun 2009 01:18:57 +0000
Subject: [PATCH] --- yaml --- r: 150589 b: refs/heads/master c:
 b61b8af0f3883b451bb9c3b3eaea4379aca9f36f h: refs/heads/master i:   150587:
 53292ac456be44bf5c3ccb727450b34dbe5dad40 v: v3

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

diff --git a/[refs] b/[refs]
index 0fd441f6ace7..8bf7bb2643a4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c69367fd6730a330c4ba54e9e699733439cbbabd
+refs/heads/master: b61b8af0f3883b451bb9c3b3eaea4379aca9f36f
diff --git a/trunk/drivers/usb/gadget/f_phonet.c b/trunk/drivers/usb/gadget/f_phonet.c
index d6b48714d899..96fb118355b0 100644
--- a/trunk/drivers/usb/gadget/f_phonet.c
+++ b/trunk/drivers/usb/gadget/f_phonet.c
@@ -569,9 +569,10 @@ static struct net_device *dev;
 int __init phonet_bind_config(struct usb_configuration *c)
 {
 	struct f_phonet *fp;
-	int err;
+	int err, size;
 
-	fp = kzalloc(sizeof(*fp), GFP_KERNEL);
+	size = sizeof(*fp) + (phonet_rxq_size * sizeof(struct usb_request *));
+	fp = kzalloc(size, GFP_KERNEL);
 	if (!fp)
 		return -ENOMEM;
 
@@ -596,9 +597,7 @@ int __init gphonet_setup(struct usb_gadget *gadget)
 
 	/* Create net device */
 	BUG_ON(dev);
-	dev = alloc_netdev(sizeof(*port)
-		+ (phonet_rxq_size * sizeof(struct usb_request *)),
-				"upnlink%d", pn_net_setup);
+	dev = alloc_netdev(sizeof(*port), "upnlink%d", pn_net_setup);
 	if (!dev)
 		return -ENOMEM;