diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 13:09:50 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 13:09:50 -0400 |
commit | a27028349ccbcec9dde9d6dbba9d4017ad9ad5ab (patch) | |
tree | 58d7deaeda91cf854543b8dfcef097097eb856fb /drivers/usb/gadget/pxa27x_udc.c | |
parent | 45432371b448c80622d8069b845625996127caeb (diff) | |
parent | 6c6409459a18a825ce12ecb003d5686af61f7a2f (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:
USB: don't rebind drivers after failed resume or reset
USB: fix memory leak in cdc-acm
USB: Unusual dev for Mio moov 330 gps
USB: cdc-wdm: make module autoload work
USB: Fix unneeded endpoint check in pxa27x_udc
usb/gadget: fix kernel-doc warning
USB: Speedtouch: add pre_reset and post_reset routines
USB: usbtest.c: length, sglen and vary are unsigned, so cannot be negative
USB: support Huawei data card product IDs
USB: add ZTE MF626 USB GSM modem entry
USB: storage: Avoid I/O errors when issuing SCSI ioctls to JMicron USB/ATA bridge
USB: Fix debugfs_create_file's error checking method for usb/gadget/s3c2410_udc
USB: ohci: add support for tmio-ohci cell
Diffstat (limited to 'drivers/usb/gadget/pxa27x_udc.c')
-rw-r--r-- | drivers/usb/gadget/pxa27x_udc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c index bcf375ca3d72..caa37c95802c 100644 --- a/drivers/usb/gadget/pxa27x_udc.c +++ b/drivers/usb/gadget/pxa27x_udc.c | |||
@@ -650,7 +650,7 @@ pxa_ep_alloc_request(struct usb_ep *_ep, gfp_t gfp_flags) | |||
650 | struct pxa27x_request *req; | 650 | struct pxa27x_request *req; |
651 | 651 | ||
652 | req = kzalloc(sizeof *req, gfp_flags); | 652 | req = kzalloc(sizeof *req, gfp_flags); |
653 | if (!req || !_ep) | 653 | if (!req) |
654 | return NULL; | 654 | return NULL; |
655 | 655 | ||
656 | INIT_LIST_HEAD(&req->queue); | 656 | INIT_LIST_HEAD(&req->queue); |