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

Commit f98c76a7 authored by Vijayavardhan Vennapusa's avatar Vijayavardhan Vennapusa
Browse files

USB: dwc3-msm: Check endpoint status and request queued or not first 



When function driver calls dwc3_msm_ep_queue() to queue endless request,
first check endpoint status and whether any request already queued or not.
If that is the case, return error. Else go ahead with queuing request
to USB HW. This helps in resolving the crash seen when request is being
queued again.

Change-Id: I3d6a603c693d1df36719f57684ffad409e1a0e78
Signed-off-by: default avatarVijayavardhan Vennapusa <vvreddy@codeaurora.org>
parent 602e975c

drivers/usb/dwc3/dwc3-msm.c

+27 −21
Original line number Diff line number Diff line
@@ -671,6 +671,33 @@ static int dwc3_msm_ep_queue(struct usb_ep *ep, 
		return -EINVAL;

	}



	spin_lock_irqsave(&dwc->lock, flags);

	if (!dep->endpoint.desc) {

		dev_err(mdwc->dev,

			"%s: trying to queue request %p to disabled ep %s\n",

			__func__, request, ep->name);

		return -EPERM;

	}



	if (dep->number == 0 || dep->number == 1) {

		dev_err(mdwc->dev,

			"%s: trying to queue dbm request %p to control ep %s\n",

			__func__, request, ep->name);

		return -EPERM;

	}





	if (dep->busy_slot != dep->free_slot || !list_empty(&dep->request_list)

					 || !list_empty(&dep->req_queued)) {

		dev_err(mdwc->dev,

			"%s: trying to queue dbm request %p tp ep %s\n",

			__func__, request, ep->name);

		return -EPERM;

	}

	dep->busy_slot = 0;

	dep->free_slot = 0;



	spin_unlock_irqrestore(&dwc->lock, flags);

	/*

	 * Override req->complete function, but before doing that,

	 * store it's original pointer in the req_complete_list.
@@ -709,27 +736,6 @@ static int dwc3_msm_ep_queue(struct usb_ep *ep, 
		goto err;

	}



	if (dep->number == 0 || dep->number == 1) {

		dev_err(mdwc->dev,

			"%s: trying to queue dbm request %p to control ep %s\n",

			__func__, request, ep->name);

		ret = -EPERM;

		goto err;

	}





	if (dep->busy_slot != dep->free_slot || !list_empty(&dep->request_list)

					 || !list_empty(&dep->req_queued)) {

		dev_err(mdwc->dev,

			"%s: trying to queue dbm request %p tp ep %s\n",

			__func__, request, ep->name);

		ret = -EPERM;

		goto err;

	} else {

		dep->busy_slot = 0;

		dep->free_slot = 0;

	}



	ret = __dwc3_msm_ep_queue(dep, req);

	if (ret < 0) {

		dev_err(mdwc->dev,