Skip to contentSkip to conversation

mt76: Fix an IS_ERR() vs NULL check in mt76_wmac_probe()

PATCH In review Dan Carpenter 2 participants 2 messages Mar 6, 2019

Subsystems (3)
Kernel janitors Arm MediaTek MediaTek MT76 wireless LAN driver
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 mt76: Fix an IS_ERR() vs NULL check in mt76_wmac_probe()

The devm_ioremap_resource() function never returns NULL, it returns error pointers.

Fixes c8846e101502 ("mt76: add driver for MT7603E and MT7628/7688")
Signed-off-by Dan Carpenter <[email protected]>
---
 drivers/net/wireless/mediatek/mt76/mt7603/soc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7603/soc.c +2 -2
index e13fea80d970..b920be1f5718 100644
@@ -23,9 +23,9 @@ mt76_wmac_probe(struct platform_device *pdev)
 	}
 
 	mem_base = devm_ioremap_resource(&pdev->dev, res);
-	if (!mem_base) {
+	if (IS_ERR(mem_base)) {
 		dev_err(&pdev->dev, "Failed to get memory resource\n");
-		return -EINVAL;
+		return PTR_ERR(mem_base);
 	}
 
 	mdev = mt76_alloc_device(&pdev->dev, sizeof(*dev), &mt7603_ops,
Signature · 1 line
2.17.1
#1 lore raw
Quoted 14 lines · Dan Carpenter

The devm_ioremap_resource() function never returns NULL, it returns error pointers.

Fixes c8846e101502 ("mt76: add driver for MT7603E and MT7628/7688")
Signed-off-by Dan Carpenter <[email protected]>
---
 drivers/net/wireless/mediatek/mt76/mt7603/soc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7603/soc.c +0 -0
index e13fea80d970..b920be1f5718 100644

drivers/net/wireless/mediatek/mt76/mt7603/soc.c mt76_wmac_probe(struct platform_device *pdev) · line 29

Quoted 9 lines
drivers/net/wireless/mediatek/mt76/mt7603/soc.c +2 -2
@@ -23,9 +23,9 @@ mt76_wmac_probe(struct platform_device *pdev)
 	}
 
 	mem_base = devm_ioremap_resource(&pdev->dev, res);
-	if (!mem_base) {
+	if (IS_ERR(mem_base)) {
 		dev_err(&pdev->dev, "Failed to get memory resource\n");
-		return -EINVAL;
+		return PTR_ERR(mem_base);
 	}

Wei already posted an identical patch:

https://patchwork.kernel.org/patch/10837285/

Signature · 1 line
Kalle Valo