Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56b96117 authored by Guido Kiener's avatar Guido Kiener Committed by Greg Kroah-Hartman
Browse files

usb: gadget: net2280: Fix net2280_dequeue() 



[ Upstream commit f1d3fba17cd4eeea20397f1324b7b9c69a6a935c ]

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: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGuido Kiener <guido.kiener@rohde-schwarz.com>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: default avatarSasha Levin (Microsoft) <sashal@kernel.org>
parent ebb77904

drivers/usb/gadget/udc/net2280.c

+2 −2
Original line number Diff line number Diff line
@@ -1277,9 +1277,9 @@ static int net2280_dequeue(struct usb_ep *_ep, struct usb_request *_req) 
			break;

	}

	if (&req->req != _req) {

		ep->stopped = stopped;

		spin_unlock_irqrestore(&ep->dev->lock, flags);

		dev_err(&ep->dev->pdev->dev, "%s: Request mismatch\n",

								__func__);

		ep_dbg(ep->dev, "%s: Request mismatch\n", __func__);

		return -EINVAL;

	}