aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuido Kiener <guido@kiener-muenchen.de>2019-03-18 04:18:33 -0400
committerFelipe Balbi <felipe.balbi@linux.intel.com>2019-03-20 02:50:19 -0400
commitf1d3fba17cd4eeea20397f1324b7b9c69a6a935c (patch)
tree79db187a83c2629f29a02780fc7c3660fe8ca5f0
parent9d6a54c1430647355a5e23434881b2ca3d192b48 (diff)
usb: gadget: net2280: Fix net2280_dequeue()
When a request must be dequeued with net2280_dequeue() e.g. due to a device clear action and the same request is finished by the function scan_dma_completions() then the function net2280_dequeue() does not find the request in the following search loop and returns the error -EINVAL without restoring the status ep->stopped. Thus the endpoint keeps blocked and does not receive any data anymore. This fix restores the status and does not issue an error message. Acked-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Guido Kiener <guido.kiener@rohde-schwarz.com> Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
-rw-r--r--drivers/usb/gadget/udc/net2280.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/gadget/udc/net2280.c b/drivers/usb/gadget/udc/net2280.c
index e0b413e9e532..898339e5df10 100644
--- a/drivers/usb/gadget/udc/net2280.c
+++ b/drivers/usb/gadget/udc/net2280.c
@@ -1273,9 +1273,9 @@ static int net2280_dequeue(struct usb_ep *_ep, struct usb_request *_req)
1273 break; 1273 break;
1274 } 1274 }
1275 if (&req->req != _req) { 1275 if (&req->req != _req) {
1276 ep->stopped = stopped;
1276 spin_unlock_irqrestore(&ep->dev->lock, flags); 1277 spin_unlock_irqrestore(&ep->dev->lock, flags);
1277 dev_err(&ep->dev->pdev->dev, "%s: Request mismatch\n", 1278 ep_dbg(ep->dev, "%s: Request mismatch\n", __func__);
1278 __func__);
1279 return -EINVAL; 1279 return -EINVAL;
1280 } 1280 }
1281 1281