Skip to contentSkip to conversation

soc: qcom: Fix a IS_ERR() vs NULL bug in probe

PATCH Applied Dan Carpenter 3 participants 3 messages Jun 6, 2023 – Jun 13, 2023

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

PATCH 1/1 soc: qcom: Fix a IS_ERR() vs NULL bug in probe

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

Fixes a77b2a0b1280 ("soc: qcom: Introduce RPM master stats driver")
---
 drivers/soc/qcom/rpm_master_stats.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/soc/qcom/rpm_master_stats.c +1 -1
index 6dd98b9f7129..9ca13bcf67d3 100644
@@ -105,7 +105,7 @@ static int master_stats_probe(struct platform_device *pdev)
 		}
 
 		data[i].base = devm_ioremap(dev, res.start, resource_size(&res));
-		if (IS_ERR(data[i].base)) {
+		if (!data[i].base) {
 			debugfs_remove_recursive(root);
 			return dev_err_probe(dev, -EINVAL,
 					     "Could not map the MSG RAM slice idx %d!\n", i);
Signature · 1 line
2.30.2
Reviewed-by on v1 1/1
#1 lore raw
Quoted 6 lines · Dan Carpenter

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

Fixes a77b2a0b1280 ("soc: qcom: Introduce RPM master stats driver")

---

Thanks!

Konrad

Quoted 16 lines
 drivers/soc/qcom/rpm_master_stats.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/soc/qcom/rpm_master_stats.c +1 -1
index 6dd98b9f7129..9ca13bcf67d3 100644
@@ -105,7 +105,7 @@ static int master_stats_probe(struct platform_device *pdev)
 		}
 
 		data[i].base = devm_ioremap(dev, res.start, resource_size(&res));
-		if (IS_ERR(data[i].base)) {
+		if (!data[i].base) {
 			debugfs_remove_recursive(root);
 			return dev_err_probe(dev, -EINVAL,
 					     "Could not map the MSG RAM slice idx %d!\n", i);
maintainer Applied
#2 lore raw
In reply to Dan Carpenter
Quoted 4 lines · Dan Carpenter

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

Applied, thanks!

[1/1] soc: qcom: Fix a IS_ERR() vs NULL bug in probe

      commit: 3aed112953b1877ede66ae77afa4e5a5024be7cb

Best regards,

Signature · 1 line
Bjorn Andersson <[email protected]>