From: Haimin Zhang <tcs.kernel@gmail.com>
To: gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org,
linux-usb@vger.kernel.org
Cc: Haimin Zhang <tcs_kernel@tencent.com>, TCS Robot <tcs_robot@tencent.com>
Subject: [PATCH 2/2] USB: ehci_brcm_hub_control: replace wIndex-1 with temp
Date: Fri, 5 Nov 2021 16:33:57 +0800 [thread overview]
Message-ID: <20211105083357.29715-1-tcs_kernel@tencent.com> (raw)
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)
next reply other threads:[~2021-11-05 8:34 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-05 8:33 Haimin Zhang [this message]
2021-11-05 8:52 ` [PATCH 2/2] USB: ehci_brcm_hub_control: replace wIndex-1 with temp Greg KH
2021-11-05 13:34 ` Alan Stern
2021-11-05 16:09 ` Florian Fainelli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211105083357.29715-1-tcs_kernel@tencent.com \
--to=tcs.kernel@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=tcs_kernel@tencent.com \
--cc=tcs_robot@tencent.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox