git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From 9629dbdabd1983ef53f125336e1d62d77b1620f9 Mon Sep 17 00:00:00 2001
   2 From: Baolin Wang <baolin.wang@linaro.org>
   3 Date: Tue, 8 Oct 2019 15:41:38 +0800
   4 Subject: clk: sprd: Use IS_ERR() to validate the return value of syscon_regmap_lookup_by_phandle()
   5
   6 From: Baolin Wang <baolin.wang@linaro.org>
   7
   8 commit 9629dbdabd1983ef53f125336e1d62d77b1620f9 upstream.
   9
  10 The syscon_regmap_lookup_by_phandle() will never return NULL, thus use
  11 IS_ERR() to validate the return value instead of IS_ERR_OR_NULL().
  12
  13 Fixes: d41f59fd92f2 ("clk: sprd: Add common infrastructure")
  14 Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
  15 Link: https://lkml.kernel.org/r/1995139bee5248ff3e9d46dc715968f212cfc4cc.1570520268.git.baolin.wang@linaro.org
  16 Signed-off-by: Stephen Boyd <sboyd@kernel.org>
  17 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  18
  19 ---
  20  drivers/clk/sprd/common.c |    2 +-
  21  1 file changed, 1 insertion(+), 1 deletion(-)
  22
  23 --- a/drivers/clk/sprd/common.c
  24 +++ b/drivers/clk/sprd/common.c
  25 @@ -45,7 +45,7 @@ int sprd_clk_regmap_init(struct platform
  26
  27         if (of_find_property(node, "sprd,syscon", NULL)) {
  28                 regmap = syscon_regmap_lookup_by_phandle(node, "sprd,syscon");
  29 -               if (IS_ERR_OR_NULL(regmap)) {
  30 +               if (IS_ERR(regmap)) {
  31                         pr_err("%s: failed to get syscon regmap\n", __func__);
  32                         return PTR_ERR(regmap);
  33                 }