Skip to contentSkip to conversation

clk: meson-axg: fix return value check in axg_clkc_probe()

PATCH New Wei Yongjun 2 participants 2 messages Dec 28, 2017

Subsystems (3)
Arm/Amlogic Meson SoC support Common clk Arm/Amlogic Meson SoC clock framework
lore
Share & tools
lore

Wei Yongjun

author
#0 lore raw

PATCH 1/1 clk: meson-axg: fix return value check in axg_clkc_probe()

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

Fixes 78b4af312f91 ("clk: meson-axg: add clock controller drivers")
Signed-off-by Wei Yongjun <[email protected]>
---
 drivers/clk/meson/axg.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/meson/axg.c +1 -1
index a66b3a5..717c02d 100644
@@ -880,7 +880,7 @@ static int axg_clkc_probe(struct platform_device *pdev)
 	/*  Generic clocks and PLLs */
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	clk_base = devm_ioremap(&pdev->dev, res->start, resource_size(res));
-	if (IS_ERR(clk_base)) {
+	if (!clk_base) {
 		dev_err(&pdev->dev, "Unable to map clk base\n");
 		return -ENXIO;
 	}
Applied
#1 lore raw

PATCH 1/1 clk: meson-axg: fix return value check in axg_clkc_probe()

Quoted 7 lines · Wei Yongjun

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

Fixes 78b4af312f91 ("clk: meson-axg: add clock controller drivers")
Signed-off-by Wei Yongjun <[email protected]>

---

Applied to clk-next

Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project