lkml.org 
[lkml]   [2020]   [Jun]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.4 197/266] clk: sprd: return correct type of value for _sprd_pll_recalc_rate
    Date
    From: Chunyan Zhang <chunyan.zhang@unisoc.com>

    [ Upstream commit c2f30986d418f26abefc2eec90ebf06716c970d2 ]

    The function _sprd_pll_recalc_rate() defines return value to unsigned
    long, but it would return a negative value when malloc fail, changing
    to return its parent_rate makes more sense, since if the callback
    .recalc_rate() is not set, the framework returns the parent_rate as
    well.

    Fixes: 3e37b005580b ("clk: sprd: add adjustable pll support")
    Signed-off-by: Chunyan Zhang <chunyan.zhang@unisoc.com>
    Link: https://lkml.kernel.org/r/20200519030036.1785-2-zhang.lyra@gmail.com
    Reviewed-by: Baolin Wang <baolin.wang7@gmail.com>
    Signed-off-by: Stephen Boyd <sboyd@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/clk/sprd/pll.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/clk/sprd/pll.c b/drivers/clk/sprd/pll.c
    index 640270f51aa5..eb8862752c2b 100644
    --- a/drivers/clk/sprd/pll.c
    +++ b/drivers/clk/sprd/pll.c
    @@ -105,7 +105,7 @@ static unsigned long _sprd_pll_recalc_rate(const struct sprd_pll *pll,

    cfg = kcalloc(regs_num, sizeof(*cfg), GFP_KERNEL);
    if (!cfg)
    - return -ENOMEM;
    + return parent_rate;

    for (i = 0; i < regs_num; i++)
    cfg[i] = sprd_pll_read(pll, i);
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-06-18 03:24    [W:4.068 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site