Skip to contentSkip to conversation

soc: qcom: cmd-db: Fix an error code in cmd_db_dev_probe()

PATCH In review Dan Carpenter 2 participants 2 messages Feb 28, 2019 – Mar 1, 2019

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

PATCH 1/1 soc: qcom: cmd-db: Fix an error code in cmd_db_dev_probe()

The memremap() function doesn't return error pointers, it returns NULL. This code is returning "ret = PTR_ERR(NULL);" which is success, but it should return -ENOMEM.

Fixes 312416d9171a ("drivers: qcom: add command DB driver")
---
 drivers/soc/qcom/cmd-db.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/soc/qcom/cmd-db.c +2 -2
index c701b3b010f1..f6c3d17b05c7 100644
@@ -248,8 +248,8 @@ static int cmd_db_dev_probe(struct platform_device *pdev)
 	}
 
 	cmd_db_header = memremap(rmem->base, rmem->size, MEMREMAP_WB);
-	if (IS_ERR_OR_NULL(cmd_db_header)) {
-		ret = PTR_ERR(cmd_db_header);
+	if (!cmd_db_header) {
+		ret = -ENOMEM;
 		cmd_db_header = NULL;
 		return ret;
 	}
Signature · 1 line
2.17.1
#1 lore raw
Quoted 7 lines · Dan Carpenter

The memremap() function doesn't return error pointers, it returns NULL. This code is returning "ret = PTR_ERR(NULL);" which is success, but it should return -ENOMEM.

Fixes 312416d9171a ("drivers: qcom: add command DB driver")

---

Thanks Dan, picking this up.

Regards,
Bjorn

Quoted 21 lines
 drivers/soc/qcom/cmd-db.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/soc/qcom/cmd-db.c +2 -2
index c701b3b010f1..f6c3d17b05c7 100644
@@ -248,8 +248,8 @@ static int cmd_db_dev_probe(struct platform_device *pdev)
 	}
 
 	cmd_db_header = memremap(rmem->base, rmem->size, MEMREMAP_WB);
-	if (IS_ERR_OR_NULL(cmd_db_header)) {
-		ret = PTR_ERR(cmd_db_header);
+	if (!cmd_db_header) {
+		ret = -ENOMEM;
 		cmd_db_header = NULL;
 		return ret;
 	}
Signature · 1 line
2.17.1