clk: imx: pllv2: avoid using uninitialized values
authorLucas Stach <l.stach@pengutronix.de>
Wed, 17 Jan 2018 15:02:56 +0000 (16:02 +0100)
committerStephen Boyd <sboyd@kernel.org>
Fri, 16 Mar 2018 22:40:41 +0000 (15:40 -0700)
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>
drivers/clk/imx/clk-pllv2.c

index 85b5cbe..eeba3cb 100644 (file)
@@ -182,8 +182,12 @@ static long clk_pllv2_round_rate(struct clk_hw *hw, unsigned long rate,
                unsigned long *prate)
 {
        u32 dp_op, dp_mfd, dp_mfn;
+       int ret;
+
+       ret = __clk_pllv2_set_rate(rate, *prate, &dp_op, &dp_mfd, &dp_mfn);
+       if (ret)
+               return ret;
 
-       __clk_pllv2_set_rate(rate, *prate, &dp_op, &dp_mfd, &dp_mfn);
        return __clk_pllv2_recalc_rate(*prate, MXC_PLL_DP_CTL_DPDCK0_2_EN,
                        dp_op, dp_mfd, dp_mfn);
 }