Merge "dwc3: gadget: Check for endpoint status before doing remote wakeup"

This commit is contained in:
Linux Build Service Account 2014-10-21 06:12:24 -07:00 committed by Gerrit - the friendly Code Review server
commit bd2939b37e
1 changed files with 6 additions and 5 deletions

View File

@ -1484,11 +1484,6 @@ static int dwc3_gadget_ep_queue(struct usb_ep *ep, struct usb_request *request,
unsigned long flags;
int ret;
if (dwc3_gadget_is_suspended(dwc)) {
dwc3_gadget_wakeup(&dwc->gadget);
return -EAGAIN;
}
spin_lock_irqsave(&dwc->lock, flags);
if (!dep->endpoint.desc) {
@ -1498,6 +1493,12 @@ static int dwc3_gadget_ep_queue(struct usb_ep *ep, struct usb_request *request,
return -ESHUTDOWN;
}
if (dwc3_gadget_is_suspended(dwc)) {
dwc3_gadget_wakeup(&dwc->gadget);
spin_unlock_irqrestore(&dwc->lock, flags);
return -EAGAIN;
}
dev_vdbg(dwc->dev, "queing request %p to %s length %d\n",
request, ep->name, request->length);