[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20211105083357.29715-1-tcs_kernel@tencent.com>
Date: Fri, 5 Nov 2021 16:33:57 +0800
From: Haimin Zhang <tcs.kernel@...il.com>
To: gregkh@...uxfoundation.org, linux-kernel@...r.kernel.org,
linux-usb@...r.kernel.org
Cc: Haimin Zhang <tcs_kernel@...cent.com>,
TCS Robot <tcs_robot@...cent.com>
Subject: [PATCH 2/2] USB: ehci_brcm_hub_control: replace wIndex-1 with temp
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@...cent.com>
Reported-by: TCS Robot <tcs_robot@...cent.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)
Powered by blists - more mailing lists