diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2016-01-10 16:53:55 +0100 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2016-01-10 16:53:55 +0100 |
| commit | 8b63b6bfc1a551acf154061699028c7032d7890c (patch) | |
| tree | 16882e9bc9e35eacb870a6d8a71617e579c4ffdc /drivers/usb/dwc3/gadget.c | |
| parent | libnvdimm: fix namespace object confusion in is_uuid_busy() (diff) | |
| parent | block: kill disk_{check|set|clear|alloc}_badblocks (diff) | |
| download | linux-8b63b6bfc1a551acf154061699028c7032d7890c.tar.xz linux-8b63b6bfc1a551acf154061699028c7032d7890c.zip | |
Merge branch 'for-4.5/block-dax' into for-4.5/libnvdimm
Diffstat (limited to 'drivers/usb/dwc3/gadget.c')
| -rw-r--r-- | drivers/usb/dwc3/gadget.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index e24a01cc98df..a58376fd65fe 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -1078,6 +1078,7 @@ static int __dwc3_gadget_ep_queue(struct dwc3_ep *dep, struct dwc3_request *req) * little bit faster. */ if (!usb_endpoint_xfer_isoc(dep->endpoint.desc) && + !usb_endpoint_xfer_int(dep->endpoint.desc) && !(dep->flags & DWC3_EP_BUSY)) { ret = __dwc3_gadget_kick_transfer(dep, 0, true); goto out; |