OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Rémi Denis-Courmont 2009-06-01 01:18:57 +00:00 committed by David S. Miller
parent c69367fd67
commit b61b8af0f3
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/usb/gadget/f_phonet.c
View File

@ -569,9 +569,10 @@ static struct net_device *dev;
int __init phonet_bind_config(struct usb_configuration *c) int __init phonet_bind_config(struct usb_configuration *c)
{ {
struct f_phonet *fp; 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) if (!fp)
return -ENOMEM; return -ENOMEM;
@ -596,9 +597,7 @@ int __init gphonet_setup(struct usb_gadget *gadget)
/* Create net device */ /* Create net device */
BUG_ON(dev); BUG_ON(dev);
dev = alloc_netdev(sizeof(*port) dev = alloc_netdev(sizeof(*port), "upnlink%d", pn_net_setup);
+ (phonet_rxq_size * sizeof(struct usb_request *)),
"upnlink%d", pn_net_setup);
if (!dev) if (!dev)
return -ENOMEM; return -ENOMEM;