lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clk: sprd: return correct type of value for _sprd_pll_recalc_rate

Browse Source 
[ 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: 3e37b00558 ("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>
This commit is contained in:
Chunyan Zhang 2020-05-19 11:00:36 +08:00 committed by Greg Kroah-Hartman
parent e5497842e2
commit c66e72f172
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/clk/sprd/pll.c
View File

@ -105,7 +105,7 @@ static unsigned long _sprd_pll_recalc_rate(const struct sprd_pll *pll,
cfg = kcalloc(regs_num, sizeof(*cfg), GFP_KERNEL); cfg = kcalloc(regs_num, sizeof(*cfg), GFP_KERNEL);
if (!cfg) if (!cfg)
return -ENOMEM; return parent_rate;
for (i = 0; i < regs_num; i++) for (i = 0; i < regs_num; i++)
cfg[i] = sprd_pll_read(pll, i); cfg[i] = sprd_pll_read(pll, i);