Skip to contentSkip to conversation

clocksource/drivers/ingenic_ost: Fix return value check in ingenic_ost_probe()

PATCH Applied 'Wei Yongjun 2 participants 2 messages Mar 8, 2021 – Apr 9, 2021

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

PATCH 1/1 clocksource/drivers/ingenic_ost: Fix return value check in ingenic_ost_probe()

From: Wei Yongjun <[email protected]>

In case of error, the function device_node_to_regmap() returns ERR_PTR() and never returns NULL. The NULL test in the return value check should be replaced with IS_ERR().

Fixes ca7b72b5a5f2 ("clocksource: Add driver for the Ingenic JZ47xx OST")
---
 drivers/clocksource/ingenic-ost.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/clocksource/ingenic-ost.c +2 -2
index 029efc2731b4..6af2470136bd 100644
@@ -88,9 +88,9 @@ static int __init ingenic_ost_probe(struct platform_device *pdev)
 		return PTR_ERR(ost->regs);
 
 	map = device_node_to_regmap(dev->parent->of_node);
-	if (!map) {
+	if (IS_ERR(map)) {
 		dev_err(dev, "regmap not found");
-		return -EINVAL;
+		return PTR_ERR(map);
 	}
 
 	ost->clk = devm_clk_get(dev, "ost");
merge bot Applied
#1 lore raw
The following commit has been merged into the timers/core branch of tip:

The following commit has been merged into the timers/core branch of tip:

Commit-ID:     2a65f7e2772613debd03fa2492e76a635aa04545
Gitweb:        https://git.kernel.org/tip/2a65f7e2772613debd03fa2492e76a635aa04545
Author:        Wei Yongjun <[email protected]>
AuthorDate:    Mon, 08 Mar 2021 12:30:31 
Committer:     Daniel Lezcano <[email protected]>
CommitterDate: Thu, 08 Apr 2021 13:24:15 +02:00

clocksource/drivers/ingenic_ost: Fix return value check in ingenic_ost_probe()

In case of error, the function device_node_to_regmap() returns ERR_PTR() and never returns NULL. The NULL test in the return value check should be replaced with IS_ERR().

Fixes ca7b72b5a5f2 ("clocksource: Add driver for the Ingenic JZ47xx OST")
---
 drivers/clocksource/ingenic-ost.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/clocksource/ingenic-ost.c +2 -2
index d2d6646..06d2575 100644
@@ -88,9 +88,9 @@ static int __init ingenic_ost_probe(struct platform_device *pdev)
 		return PTR_ERR(ost->regs);
 
 	map = device_node_to_regmap(dev->parent->of_node);
-	if (!map) {
+	if (IS_ERR(map)) {
 		dev_err(dev, "regmap not found");
-		return -EINVAL;
+		return PTR_ERR(map);
 	}
 
 	ost->clk = devm_clk_get(dev, "ost");