On 21-04-20 06:28:13, Pawel Laszczak wrote:
> From: Pawel Laszczak <pawell@xxxxxxxxxxx>
>
> Patch fixes lack of removing request from ep->pending_list on failure
> of the stop endpoint command. Driver even after failing this command
> must remove request from ep->pending_list.
> Without this fix driver can stuck in cdnsp_gadget_ep_disable function
> in loop:
> while (!list_empty(&pep->pending_list)) {
> preq = next_request(&pep->pending_list);
> cdnsp_ep_dequeue(pep, preq);
> }
>
> Fixes: 3d82904559f4 ("usb: cdnsp: cdns3 Add main part of Cadence USBSSP DRD Driver")
> Signed-off-by: Pawel Laszczak <pawell@xxxxxxxxxxx>
Applied, thanks.
Peter
>
> ---
> Changelog:
> v2:
> - removed blank space
> - added "Fixes" tag
>
> drivers/usb/cdns3/cdnsp-gadget.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/usb/cdns3/cdnsp-gadget.c b/drivers/usb/cdns3/cdnsp-gadget.c
> index 56707b6b0f57..c083985e387b 100644
> --- a/drivers/usb/cdns3/cdnsp-gadget.c
> +++ b/drivers/usb/cdns3/cdnsp-gadget.c
> @@ -422,17 +422,17 @@ int cdnsp_ep_enqueue(struct cdnsp_ep *pep, struct cdnsp_request *preq)
> int cdnsp_ep_dequeue(struct cdnsp_ep *pep, struct cdnsp_request *preq)
> {
> struct cdnsp_device *pdev = pep->pdev;
> - int ret;
> + int ret_stop = 0;
> + int ret_rem;
>
> trace_cdnsp_request_dequeue(preq);
>
> - if (GET_EP_CTX_STATE(pep->out_ctx) == EP_STATE_RUNNING) {
> - ret = cdnsp_cmd_stop_ep(pdev, pep);
> - if (ret)
> - return ret;
> - }
> + if (GET_EP_CTX_STATE(pep->out_ctx) == EP_STATE_RUNNING)
> + ret_stop = cdnsp_cmd_stop_ep(pdev, pep);
> +
> + ret_rem = cdnsp_remove_request(pdev, preq, pep);
>
> - return cdnsp_remove_request(pdev, preq, pep);
> + return ret_rem ? ret_rem : ret_stop;
> }
>
> static void cdnsp_zero_in_ctx(struct cdnsp_device *pdev)
> --
> 2.25.1
>
--
Thanks,
Peter Chen
