lkml.org 
[lkml]   [2020]   [Aug]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 66/92] clk: clk-atlas6: fix return value check in atlas6_clk_init()
    Date
    From: Xu Wang <vulab@iscas.ac.cn>

    [ Upstream commit 12b90b40854a8461a02ef19f6f4474cc88d64b66 ]

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

    Signed-off-by: Xu Wang <vulab@iscas.ac.cn>
    Link: https://lore.kernel.org/r/20200713032143.21362-1-vulab@iscas.ac.cn
    Acked-by: Barry Song <baohua@kernel.org>
    Fixes: 7bf21bc81f28 ("clk: sirf: re-arch to make the codes support both prima2 and atlas6")
    Signed-off-by: Stephen Boyd <sboyd@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/clk/sirf/clk-atlas6.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/clk/sirf/clk-atlas6.c b/drivers/clk/sirf/clk-atlas6.c
    index 0cd11e6893afa..25ed60776560e 100644
    --- a/drivers/clk/sirf/clk-atlas6.c
    +++ b/drivers/clk/sirf/clk-atlas6.c
    @@ -136,7 +136,7 @@ static void __init atlas6_clk_init(struct device_node *np)

    for (i = pll1; i < maxclk; i++) {
    atlas6_clks[i] = clk_register(NULL, atlas6_clk_hw_array[i]);
    - BUG_ON(!atlas6_clks[i]);
    + BUG_ON(IS_ERR(atlas6_clks[i]));
    }
    clk_register_clkdev(atlas6_clks[cpu], NULL, "cpu");
    clk_register_clkdev(atlas6_clks[io], NULL, "io");
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-08-20 14:23    [W:2.761 / U:2.972 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site