diff options
author | Lucas Stach <l.stach@pengutronix.de> | 2018-01-17 10:02:56 -0500 |
---|---|---|
committer | Stephen Boyd <sboyd@kernel.org> | 2018-03-16 18:40:41 -0400 |
commit | 93abad369a44f3b68f0581a00c4608500f293d93 (patch) | |
tree | ca96e17a9bfa0229edc1e3b88310252c25aa5edb /drivers | |
parent | cc4d07a41113f60fc514308fb073c567938412fc (diff) |
clk: imx: pllv2: avoid using uninitialized values
Forward the errors returned by __clk_pllv2_set_rate() in the recalc rate
function, to avoid using uninitialized values for the rate calculation.
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/clk/imx/clk-pllv2.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/clk/imx/clk-pllv2.c b/drivers/clk/imx/clk-pllv2.c index 85b5cbe9744c..eeba3cb14e2d 100644 --- a/drivers/clk/imx/clk-pllv2.c +++ b/drivers/clk/imx/clk-pllv2.c | |||
@@ -182,8 +182,12 @@ static long clk_pllv2_round_rate(struct clk_hw *hw, unsigned long rate, | |||
182 | unsigned long *prate) | 182 | unsigned long *prate) |
183 | { | 183 | { |
184 | u32 dp_op, dp_mfd, dp_mfn; | 184 | u32 dp_op, dp_mfd, dp_mfn; |
185 | int ret; | ||
186 | |||
187 | ret = __clk_pllv2_set_rate(rate, *prate, &dp_op, &dp_mfd, &dp_mfn); | ||
188 | if (ret) | ||
189 | return ret; | ||
185 | 190 | ||
186 | __clk_pllv2_set_rate(rate, *prate, &dp_op, &dp_mfd, &dp_mfn); | ||
187 | return __clk_pllv2_recalc_rate(*prate, MXC_PLL_DP_CTL_DPDCK0_2_EN, | 191 | return __clk_pllv2_recalc_rate(*prate, MXC_PLL_DP_CTL_DPDCK0_2_EN, |
188 | dp_op, dp_mfd, dp_mfn); | 192 | dp_op, dp_mfd, dp_mfn); |
189 | } | 193 | } |