diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-05 17:25:34 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-05 17:25:34 +0200 |
| commit | 6fbfd0592ef88ba29cdce84ef92757351f1fa9c9 (patch) | |
| tree | 7c0af4bcc08f3ad7befb93d73d9729f82252c950 /drivers/usb/gadget/atmel_usba_udc.c | |
| parent | Extcon: Arizona: Add driver for Wolfson Arizona class devices (diff) | |
| parent | Linux 3.5-rc5 (diff) | |
| download | linux-6fbfd0592ef88ba29cdce84ef92757351f1fa9c9.tar.xz linux-6fbfd0592ef88ba29cdce84ef92757351f1fa9c9.zip | |
Merge v3.5-rc5 into driver-core-next
This picks up the big printk fixes, and resolves a merge issue with:
drivers/extcon/extcon_gpio.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/gadget/atmel_usba_udc.c')
| -rw-r--r-- | drivers/usb/gadget/atmel_usba_udc.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c index e23bf7984aaf..9a9bced813ed 100644 --- a/drivers/usb/gadget/atmel_usba_udc.c +++ b/drivers/usb/gadget/atmel_usba_udc.c @@ -599,12 +599,6 @@ usba_ep_enable(struct usb_ep *_ep, const struct usb_endpoint_descriptor *desc) spin_lock_irqsave(&ep->udc->lock, flags); - if (ep->ep.desc) { - spin_unlock_irqrestore(&ep->udc->lock, flags); - DBG(DBG_ERR, "ep%d already enabled\n", ep->index); - return -EBUSY; - } - ep->ep.desc = desc; ep->ep.maxpacket = maxpacket; |