summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaolin Wang <baolin.wang@linaro.org>2019-10-08 15:41:38 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-01-23 08:21:39 +0100
commit8e94de44ea748e6ea2b7e922b3203fd6b8403102 (patch)
treecdb60d6f44d68bcd0e1d280c53ff6fda6fdafbee
parenteaac3dc7be7b0931d07b8f0238bdd870b1d65a67 (diff)
downloadlinux-stable-8e94de44ea748e6ea2b7e922b3203fd6b8403102.tar.gz
linux-stable-8e94de44ea748e6ea2b7e922b3203fd6b8403102.tar.bz2
linux-stable-8e94de44ea748e6ea2b7e922b3203fd6b8403102.zip
clk: sprd: Use IS_ERR() to validate the return value of syscon_regmap_lookup_by_phandle()
commit 9629dbdabd1983ef53f125336e1d62d77b1620f9 upstream. The syscon_regmap_lookup_by_phandle() will never return NULL, thus use IS_ERR() to validate the return value instead of IS_ERR_OR_NULL(). Fixes: d41f59fd92f2 ("clk: sprd: Add common infrastructure") Signed-off-by: Baolin Wang <baolin.wang@linaro.org> Link: https://lkml.kernel.org/r/1995139bee5248ff3e9d46dc715968f212cfc4cc.1570520268.git.baolin.wang@linaro.org Signed-off-by: Stephen Boyd <sboyd@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/clk/sprd/common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/sprd/common.c b/drivers/clk/sprd/common.c
index 8bdab1c3013b..c9b777592b2c 100644
--- a/drivers/clk/sprd/common.c
+++ b/drivers/clk/sprd/common.c
@@ -45,7 +45,7 @@ int sprd_clk_regmap_init(struct platform_device *pdev,
if (of_find_property(node, "sprd,syscon", NULL)) {
regmap = syscon_regmap_lookup_by_phandle(node, "sprd,syscon");
- if (IS_ERR_OR_NULL(regmap)) {
+ if (IS_ERR(regmap)) {
pr_err("%s: failed to get syscon regmap\n", __func__);
return PTR_ERR(regmap);
}