diff options
author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-21 14:05:45 -0500 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-21 14:05:45 -0500 |
commit | d04cdb64212eb5ae6a98026a97dda626e40e8e9a (patch) | |
tree | b6a7dbb21ccfceb915844e9a330b3d3dfcaf3c5b /drivers/usb/gadget/pxa2xx_udc.c | |
parent | 2f8600dff2b140096a7df781884e918a16aa90e0 (diff) | |
parent | ec1248e70edc5cf7b485efcc7b41e44e10f422e5 (diff) |
Merge ../linux-2.6
Diffstat (limited to 'drivers/usb/gadget/pxa2xx_udc.c')
-rw-r--r-- | drivers/usb/gadget/pxa2xx_udc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/gadget/pxa2xx_udc.c b/drivers/usb/gadget/pxa2xx_udc.c index bb028c5b8952..680f7fc5b171 100644 --- a/drivers/usb/gadget/pxa2xx_udc.c +++ b/drivers/usb/gadget/pxa2xx_udc.c | |||
@@ -335,11 +335,10 @@ pxa2xx_ep_alloc_request (struct usb_ep *_ep, gfp_t gfp_flags) | |||
335 | { | 335 | { |
336 | struct pxa2xx_request *req; | 336 | struct pxa2xx_request *req; |
337 | 337 | ||
338 | req = kmalloc (sizeof *req, gfp_flags); | 338 | req = kzalloc(sizeof(*req), gfp_flags); |
339 | if (!req) | 339 | if (!req) |
340 | return NULL; | 340 | return NULL; |
341 | 341 | ||
342 | memset (req, 0, sizeof *req); | ||
343 | INIT_LIST_HEAD (&req->queue); | 342 | INIT_LIST_HEAD (&req->queue); |
344 | return &req->req; | 343 | return &req->req; |
345 | } | 344 | } |