|
@@ -1950,6 +1950,7 @@ static int dwc3_gadget_stop(struct usb_gadget *g)
|
|
struct dwc3 *dwc = gadget_to_dwc(g);
|
|
struct dwc3 *dwc = gadget_to_dwc(g);
|
|
unsigned long flags;
|
|
unsigned long flags;
|
|
int epnum;
|
|
int epnum;
|
|
|
|
+ u32 tmo_eps = 0;
|
|
|
|
|
|
spin_lock_irqsave(&dwc->lock, flags);
|
|
spin_lock_irqsave(&dwc->lock, flags);
|
|
|
|
|
|
@@ -1960,6 +1961,7 @@ static int dwc3_gadget_stop(struct usb_gadget *g)
|
|
|
|
|
|
for (epnum = 2; epnum < DWC3_ENDPOINTS_NUM; epnum++) {
|
|
for (epnum = 2; epnum < DWC3_ENDPOINTS_NUM; epnum++) {
|
|
struct dwc3_ep *dep = dwc->eps[epnum];
|
|
struct dwc3_ep *dep = dwc->eps[epnum];
|
|
|
|
+ int ret;
|
|
|
|
|
|
if (!dep)
|
|
if (!dep)
|
|
continue;
|
|
continue;
|
|
@@ -1967,9 +1969,24 @@ static int dwc3_gadget_stop(struct usb_gadget *g)
|
|
if (!(dep->flags & DWC3_EP_END_TRANSFER_PENDING))
|
|
if (!(dep->flags & DWC3_EP_END_TRANSFER_PENDING))
|
|
continue;
|
|
continue;
|
|
|
|
|
|
- wait_event_lock_irq(dep->wait_end_transfer,
|
|
|
|
- !(dep->flags & DWC3_EP_END_TRANSFER_PENDING),
|
|
|
|
- dwc->lock);
|
|
|
|
|
|
+ ret = wait_event_interruptible_lock_irq_timeout(dep->wait_end_transfer,
|
|
|
|
+ !(dep->flags & DWC3_EP_END_TRANSFER_PENDING),
|
|
|
|
+ dwc->lock, msecs_to_jiffies(5));
|
|
|
|
+
|
|
|
|
+ if (ret <= 0) {
|
|
|
|
+ /* Timed out or interrupted! There's nothing much
|
|
|
|
+ * we can do so we just log here and print which
|
|
|
|
+ * endpoints timed out at the end.
|
|
|
|
+ */
|
|
|
|
+ tmo_eps |= 1 << epnum;
|
|
|
|
+ dep->flags &= DWC3_EP_END_TRANSFER_PENDING;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if (tmo_eps) {
|
|
|
|
+ dev_err(dwc->dev,
|
|
|
|
+ "end transfer timed out on endpoints 0x%x [bitmap]\n",
|
|
|
|
+ tmo_eps);
|
|
}
|
|
}
|
|
|
|
|
|
out:
|
|
out:
|