diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-06-20 11:39:34 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-06-20 11:39:34 +0800 |
| commit | 24040a58379e2f2fa6aa9466911b758073b6bdfa (patch) | |
| tree | 772a93302d0e2e0f2aa333bb10a060e2e886c645 /drivers/usb/gadget/udc/udc-xilinx.c | |
| parent | 571949a40a9c00fdaa3d0256cf43c9e0c25ff2d1 (diff) | |
| parent | 0591bc2360152f851e29246884805bb77a2c3b9d (diff) | |
| download | linux-24040a58379e2f2fa6aa9466911b758073b6bdfa.tar.gz linux-24040a58379e2f2fa6aa9466911b758073b6bdfa.tar.bz2 linux-24040a58379e2f2fa6aa9466911b758073b6bdfa.zip | |
Merge tag 'usb-for-v4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-testing
Felipe writes:
usb: changes for v4.13 merge window
This time around we have a total of 57 non-merge commits. A list of
most important changes follows:
- Improvements to dwc3 tracing interface
- Initial dual-role support for dwc3
- Improvements to how we handle DMA resources in dwc3
- A new f_uac1 implementation which much more flexible
- Removal of AVR32 bits
- Improvements to f_mass_storage driver
Diffstat (limited to 'drivers/usb/gadget/udc/udc-xilinx.c')
| -rw-r--r-- | drivers/usb/gadget/udc/udc-xilinx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/udc/udc-xilinx.c b/drivers/usb/gadget/udc/udc-xilinx.c index 588e2531b8b8..de207a90571e 100644 --- a/drivers/usb/gadget/udc/udc-xilinx.c +++ b/drivers/usb/gadget/udc/udc-xilinx.c @@ -1151,7 +1151,7 @@ static int xudc_ep_dequeue(struct usb_ep *_ep, struct usb_request *_req) break; } if (&req->usb_req != _req) { - spin_unlock_irqrestore(&ep->udc->lock, flags); + spin_unlock_irqrestore(&udc->lock, flags); return -EINVAL; } xudc_done(ep, req, -ECONNRESET); |