linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 2/2] USB: ehci_brcm_hub_control: replace wIndex-1 with temp
@ 2021-11-05  8:33 Haimin Zhang
  2021-11-05  8:52 ` Greg KH
  0 siblings, 1 reply; 4+ messages in thread
From: Haimin Zhang @ 2021-11-05  8:33 UTC (permalink / raw)
  To: gregkh, linux-kernel, linux-usb; +Cc: Haimin Zhang, TCS Robot

In function `ehci_brcm_hub_control`, like following code,  
it filters out the case where the upper byte of wIndex is nonzero, 
so it need be replaced with temp.
```
	if ((typeReq == GetPortStatus) &&
	    (wIndex && wIndex <= ports) &&       // need to be replaced
	    ehci->reset_done[wIndex-1] &&
	    time_after_eq(jiffies, ehci->reset_done[wIndex-1]) &&
	    (ehci_readl(ehci, status_reg) & PORT_RESUME)) {
```

Signed-off-by: Haimin Zhang <tcs_kernel@tencent.com>
Reported-by: TCS Robot <tcs_robot@tencent.com>
---
 drivers/usb/host/ehci-brcm.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/host/ehci-brcm.c b/drivers/usb/host/ehci-brcm.c
index a1e3290e5459..efcfca162126 100644
--- a/drivers/usb/host/ehci-brcm.c
+++ b/drivers/usb/host/ehci-brcm.c
@@ -73,9 +73,9 @@ static int ehci_brcm_hub_control(
 	 * of RESUME
 	 */
 	if ((typeReq == GetPortStatus) &&
-	    (wIndex && wIndex <= ports) &&
-	    ehci->reset_done[wIndex-1] &&
-	    time_after_eq(jiffies, ehci->reset_done[wIndex-1]) &&
+	    (temp < ports) &&
+	    ehci->reset_done[temp] &&
+	    time_after_eq(jiffies, ehci->reset_done[temp]) &&
 	    (ehci_readl(ehci, status_reg) & PORT_RESUME)) {
 
 		/*
-- 
2.30.1 (Apple Git-130)


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2021-11-05 16:09 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-05  8:33 [PATCH 2/2] USB: ehci_brcm_hub_control: replace wIndex-1 with temp Haimin Zhang
2021-11-05  8:52 ` Greg KH
2021-11-05 13:34   ` Alan Stern
2021-11-05 16:09   ` Florian Fainelli

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).