diff options
| author | Rémi Denis-Courmont <remi.denis-courmont@nokia.com> | 2009-06-01 01:18:57 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-02 00:17:46 -0700 |
| commit | b61b8af0f3883b451bb9c3b3eaea4379aca9f36f (patch) | |
| tree | 5154e774e20e8879fb8152ad4b46d8ba51f59ccb | |
| parent | c69367fd6730a330c4ba54e9e699733439cbbabd (diff) | |
| download | linux-stable-b61b8af0f3883b451bb9c3b3eaea4379aca9f36f.tar.gz linux-stable-b61b8af0f3883b451bb9c3b3eaea4379aca9f36f.tar.bz2 linux-stable-b61b8af0f3883b451bb9c3b3eaea4379aca9f36f.zip | |
usb: gadget: f_phonet: fix memory allocation sizes
Signed-off-by: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/usb/gadget/f_phonet.c | 9 |
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; 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; |