[PATCH] usb: gadget: net2280: restore ep_cfg after defect7374 workaround

[PATCH] usb: gadget: net2280: restore ep_cfg after defect7374 workaround

[Mian Yousaf Kaukab]

Defect 7374 workaround enables all GPEP as endpoint 0. Restore
endpoint number when defect 7374 workaround is disabled. Otherwise,
check to match USB endpoint number to hardware endpoint number in
net2280_enable() fails.

Cc: <stable@vger.kernel.org> # 4.2
Reported-by: Paul Jones <p.jones@teclyn.com>
Signed-off-by: Mian Yousaf Kaukab <yousaf.kaukab@intel.com>
---
Hi Felipe,
Is it possible to queue this for v4.3-rc?

BR,
Yousaf

 drivers/usb/gadget/udc/net2280.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/usb/gadget/udc/net2280.c b/drivers/usb/gadget/udc/net2280.c
index cf0ed42..6706aef 100644
--- a/drivers/usb/gadget/udc/net2280.c
+++ b/drivers/usb/gadget/udc/net2280.c
@@ -1913,7 +1913,7 @@ static void defect7374_disable_data_eps(struct net2280 *dev)
 
 	for (i = 1; i < 5; i++) {
 		ep = &dev->ep[i];
-		writel(0, &ep->cfg->ep_cfg);
+		writel(i, &ep->cfg->ep_cfg);
 	}
 
 	/* CSROUT, CSRIN, PCIOUT, PCIIN, STATIN, RCIN */
-- 
2.3.3

Re: [PATCH] usb: gadget: net2280: restore ep_cfg after defect7374 workaround

[Felipe Balbi]

[-- Attachment #1: Type: text/plain, Size: 594 bytes --]

Mian Yousaf Kaukab <yousaf.kaukab@intel.com> writes:

> Defect 7374 workaround enables all GPEP as endpoint 0. Restore
> endpoint number when defect 7374 workaround is disabled. Otherwise,
> check to match USB endpoint number to hardware endpoint number in
> net2280_enable() fails.
>
> Cc: <stable@vger.kernel.org> # 4.2
> Reported-by: Paul Jones <p.jones@teclyn.com>
> Signed-off-by: Mian Yousaf Kaukab <yousaf.kaukab@intel.com>
> ---
> Hi Felipe,
> Is it possible to queue this for v4.3-rc?

in testing/next now, this was simple enough and actually fixed a bug.

-- 
balbi

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 818 bytes --]