Skip to contentSkip to conversation

usb: misc: brcmstb-usb-pinmap: Fix an IS_ERR() vs NULL check

PATCH In review Dan Carpenter 2 participants 2 messages Nov 2, 2020 – Nov 3, 2020

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 usb: misc: brcmstb-usb-pinmap: Fix an IS_ERR() vs NULL check

The devm_ioremap() function doesn't return error pointers, it returns NULL on error.

Fixes 517c4c44b323 ("usb: Add driver to allow any GPIO to be used for 7211 USB signals")

---
The commit original commit "usb: Add driver to allow any GPIO to ..." has a bad subsystem prefix. This is a common anti-pattern for new drivers. (Although less common after I started whinging to everyone about it). It means that the first person to fix a bug in the driver has to imagine what the original author wanted. Sometimes people get annoyed which prefix we pick for them.

 drivers/usb/misc/brcmstb-usb-pinmap.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/usb/misc/brcmstb-usb-pinmap.c +2 -2
index 02144c39aaba..2326e60545f7 100644
@@ -277,8 +277,8 @@ static int __init brcmstb_usb_pinmap_probe(struct platform_device *pdev)
 	pdata->out_pins = (struct out_pin *)(pdata->in_pins + in_count);
 
 	pdata->regs = devm_ioremap(&pdev->dev, r->start, resource_size(r));
-	if (IS_ERR(pdata->regs))
-		return PTR_ERR(pdata->regs);
+	if (!pdata->regs)
+		return -ENOMEM;
 	platform_set_drvdata(pdev, pdata);
 
 	err = parse_pins(&pdev->dev, dn, pdata);
Signature · 1 line
2.28.0
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 33 lines · Dan Carpenter

The devm_ioremap() function doesn't return error pointers, it returns NULL on error.

Fixes 517c4c44b323 ("usb: Add driver to allow any GPIO to be used for 7211 USB signals")

---
The commit original commit "usb: Add driver to allow any GPIO to ..." has a bad subsystem prefix. This is a common anti-pattern for new drivers. (Although less common after I started whinging to everyone about it). It means that the first person to fix a bug in the driver has to imagine what the original author wanted. Sometimes people get annoyed which prefix we pick for them.

 drivers/usb/misc/brcmstb-usb-pinmap.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/usb/misc/brcmstb-usb-pinmap.c +2 -3
index 02144c39aaba..2326e60545f7 100644
@@ -277,8 +277,8 @@ static int __init brcmstb_usb_pinmap_probe(struct platform_device *pdev)
        pdata->out_pins = (struct out_pin *)(pdata->in_pins + in_count);
 
        pdata->regs = devm_ioremap(&pdev->dev, r->start, resource_size(r));
-       if (IS_ERR(pdata->regs))
-               return PTR_ERR(pdata->regs);
+       if (!pdata->regs)
+               return -ENOMEM;
        platform_set_drvdata(pdev, pdata);
 
        err = parse_pins(&pdev->dev, dn, pdata);
--
Quoted 2 lines

2.28.0