Commit 5bc38d33 authored by Pawel Laszczak's avatar Pawel Laszczak Committed by Greg Kroah-Hartman
Browse files

usb: cdnsp: Fixes issue with redundant Status Stage 



In some cases, driver trees to send Status Stage twice.
The first one from upper layer of gadget usb subsystem and
second time from controller driver.
This patch fixes this issue and remove tricky handling of
SET_INTERFACE from controller driver which is no longer
needed.

cc: <stable@vger.kernel.org>
Fixes: 3d829045 ("usb: cdnsp: cdns3 Add main part of Cadence USBSSP DRD Driver")
Signed-off-by: default avatarPawel Laszczak <pawell@cadence.com>
Link: https://lore.kernel.org/r/20230307111420.376056-1-pawell@cadence.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c3aa32ac

drivers/usb/cdns3/cdnsp-ep0.c

+1 −18
Original line number Diff line number Diff line
@@ -403,20 +403,6 @@ static int cdnsp_ep0_std_request(struct cdnsp_device *pdev, 
	case USB_REQ_SET_ISOCH_DELAY:

		ret = cdnsp_ep0_set_isoch_delay(pdev, ctrl);

		break;

	case USB_REQ_SET_INTERFACE:

		/*

		 * Add request into pending list to block sending status stage

		 * by libcomposite.

		 */

		list_add_tail(&pdev->ep0_preq.list,

			      &pdev->ep0_preq.pep->pending_list);



		ret = cdnsp_ep0_delegate_req(pdev, ctrl);

		if (ret == -EBUSY)

			ret = 0;



		list_del(&pdev->ep0_preq.list);

		break;

	default:

		ret = cdnsp_ep0_delegate_req(pdev, ctrl);

		break;
@@ -474,9 +460,6 @@ void cdnsp_setup_analyze(struct cdnsp_device *pdev) 
	else

		ret = cdnsp_ep0_delegate_req(pdev, ctrl);



	if (!len)

		pdev->ep0_stage = CDNSP_STATUS_STAGE;



	if (ret == USB_GADGET_DELAYED_STATUS) {

		trace_cdnsp_ep0_status_stage("delayed");

		return;
@@ -484,6 +467,6 @@ void cdnsp_setup_analyze(struct cdnsp_device *pdev) 
out:

	if (ret < 0)

		cdnsp_ep0_stall(pdev);

	else if (pdev->ep0_stage == CDNSP_STATUS_STAGE)

	else if (!len && pdev->ep0_stage != CDNSP_STATUS_STAGE)

		cdnsp_status_stage(pdev);

}