diff options
| author | Greg Kroah-Hartman | 2012-06-05 22:05:13 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2012-06-05 22:05:13 +0200 |
| commit | f2d0ed7134a15aff53aa9b09489a39bc69b1b211 (patch) | |
| tree | b2098b2feace3340d0946e4b76a30998c9bd3cf6 /drivers/usb/gadget/s3c2410_udc.c | |
| parent | Linux 3.5-rc1 (diff) | |
| parent | usb: musb_gadget: fix crash caused by dangling pointer (diff) | |
| download | kernel-qcow2-linux-f2d0ed7134a15aff53aa9b09489a39bc69b1b211.tar.gz kernel-qcow2-linux-f2d0ed7134a15aff53aa9b09489a39bc69b1b211.tar.xz kernel-qcow2-linux-f2d0ed7134a15aff53aa9b09489a39bc69b1b211.zip | |
Merge tag 'fixes-for-v3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus
usb: fixes for v3.5-rc1
Here you have the first set of fixes for our v3.5-rc cycle.
It contains a set regression fixes caused by Ido's
usb_endpoint_descriptor usage rework and a build
fix to the musb driver caused by recent changes to
the DaVinci tree.
Nothing really major, the fixes are quite obvious.
Diffstat (limited to 'drivers/usb/gadget/s3c2410_udc.c')
| -rw-r--r-- | drivers/usb/gadget/s3c2410_udc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/s3c2410_udc.c b/drivers/usb/gadget/s3c2410_udc.c index 3de71d37d75e..f2e51f50e528 100644 --- a/drivers/usb/gadget/s3c2410_udc.c +++ b/drivers/usb/gadget/s3c2410_udc.c @@ -1062,7 +1062,7 @@ static int s3c2410_udc_ep_enable(struct usb_ep *_ep, ep = to_s3c2410_ep(_ep); - if (!_ep || !desc || ep->ep.desc + if (!_ep || !desc || _ep->name == ep0name || desc->bDescriptorType != USB_DT_ENDPOINT) return -EINVAL; |