From: weiyongjun (A) <weiyongjun1@huawei.com>
Date: Thu, 28 Dec 2017 02:40:49 +0000 (+0000)
Subject: clk: meson-axg: fix return value check in axg_clkc_probe()
X-Git-Tag: v4.16-rc1~97^2~1^5~3
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=4f8f7809e47b6af17032aad66f84d7c16444bd05;p=users%2Fjedix%2Flinux-maple.git

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 <weiyongjun1@huawei.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---

diff --git a/drivers/clk/meson/axg.c b/drivers/clk/meson/axg.c
index a66b3a5e7ec05..717c02d7fe6d2 100644
--- a/drivers/clk/meson/axg.c
+++ b/drivers/clk/meson/axg.c
@@ -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;
 	}