2024-01-31 07:19:53

by Dan Carpenter

Subject: [PATCH] usb: dwc3: Fix an IS_ERR() vs NULL check in dwc3_power_off_all_roothub_ports()

The ioremap() function doesn't return error pointers, it returns NULL on
error. Update the check.

Fixes: 2d2a3349521d ("usb: dwc3: Add workaround for host mode VBUS glitch when boot")
Signed-off-by: Dan Carpenter <[email protected]>
---
drivers/usb/dwc3/host.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/usb/dwc3/host.c b/drivers/usb/dwc3/host.c
index ae189b7a4f8b..4e6239d3a0ac 100644
--- a/drivers/usb/dwc3/host.c
+++ b/drivers/usb/dwc3/host.c
@@ -35,7 +35,7 @@ static void dwc3_power_off_all_roothub_ports(struct dwc3 *dwc)
/* xhci regs is not mapped yet, do it temperary here */
if (dwc->xhci_resources[0].start) {
xhci_regs = ioremap(dwc->xhci_resources[0].start, DWC3_XHCI_REGS_END);
- if (IS_ERR(xhci_regs)) {
+ if (!xhci_regs) {
dev_err(dwc->dev, "Failed to ioremap xhci_regs\n");
return;
}
--
2.43.0

2024-02-09 00:27:19

by Thinh Nguyen

Subject: Re: [PATCH] usb: dwc3: Fix an IS_ERR() vs NULL check in dwc3_power_off_all_roothub_ports()

On Wed, Jan 31, 2024, Dan Carpenter wrote:
> The ioremap() function doesn't return error pointers, it returns NULL on
> error. Update the check.
>
> Fixes: 2d2a3349521d ("usb: dwc3: Add workaround for host mode VBUS glitch when boot")
> Signed-off-by: Dan Carpenter <[email protected]>
> ---
> drivers/usb/dwc3/host.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/usb/dwc3/host.c b/drivers/usb/dwc3/host.c
> index ae189b7a4f8b..4e6239d3a0ac 100644
> --- a/drivers/usb/dwc3/host.c
> +++ b/drivers/usb/dwc3/host.c
> @@ -35,7 +35,7 @@ static void dwc3_power_off_all_roothub_ports(struct dwc3 *dwc)
> /* xhci regs is not mapped yet, do it temperary here */
> if (dwc->xhci_resources[0].start) {
> xhci_regs = ioremap(dwc->xhci_resources[0].start, DWC3_XHCI_REGS_END);
> - if (IS_ERR(xhci_regs)) {
> + if (!xhci_regs) {
> dev_err(dwc->dev, "Failed to ioremap xhci_regs\n");
> return;
> }
> --
> 2.43.0
>

Acked-by: Thinh Nguyen <[email protected]>

Thinh