aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/gadget
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/usb/gadget')
-rw-r--r--drivers/usb/gadget/f_phonet.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/usb/gadget/f_phonet.c b/drivers/usb/gadget/f_phonet.c
index d6b48714d899..96fb118355b0 100644
--- a/drivers/usb/gadget/f_phonet.c
+++ b/drivers/usb/gadget/f_phonet.c
@@ -569,9 +569,10 @@ static struct net_device *dev;
569int __init phonet_bind_config(struct usb_configuration *c) 569int __init phonet_bind_config(struct usb_configuration *c)
570{ 570{
571 struct f_phonet *fp; 571 struct f_phonet *fp;
572 int err; 572 int err, size;
573 573
574 fp = kzalloc(sizeof(*fp), GFP_KERNEL); 574 size = sizeof(*fp) + (phonet_rxq_size * sizeof(struct usb_request *));
575 fp = kzalloc(size, GFP_KERNEL);
575 if (!fp) 576 if (!fp)
576 return -ENOMEM; 577 return -ENOMEM;
577 578
@@ -596,9 +597,7 @@ int __init gphonet_setup(struct usb_gadget *gadget)
596 597
597 /* Create net device */ 598 /* Create net device */
598 BUG_ON(dev); 599 BUG_ON(dev);
599 dev = alloc_netdev(sizeof(*port) 600 dev = alloc_netdev(sizeof(*port), "upnlink%d", pn_net_setup);
600 + (phonet_rxq_size * sizeof(struct usb_request *)),
601 "upnlink%d", pn_net_setup);
602 if (!dev) 601 if (!dev)
603 return -ENOMEM; 602 return -ENOMEM;
604 603