clk: stm32h7: fix test of clock config
authorGabriel Fernandez <gabriel.fernandez@st.com>
Wed, 11 Oct 2017 06:57:24 +0000 (08:57 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 14 Dec 2017 08:53:11 +0000 (09:53 +0100)
[ Upstream commit c1ea839c41d049604a3f64ef72712d1c7c6639d0 ]

fix test of composite clock config (bad copy / past)

Signed-off-by: Gabriel Fernandez <gabriel.fernandez@st.com>
Fixes: 3e4d618b0722 ("clk: stm32h7: Add stm32h743 clock driver")
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/clk/clk-stm32h7.c

index a94c3f5..61c3e40 100644 (file)
@@ -384,7 +384,7 @@ static void get_cfg_composite_div(const struct composite_clk_gcfg *gcfg,
        mux_ops = div_ops = gate_ops = NULL;
        mux_hw = div_hw = gate_hw = NULL;
 
-       if (gcfg->mux && gcfg->mux) {
+       if (gcfg->mux && cfg->mux) {
                mux = _get_cmux(base + cfg->mux->offset,
                                cfg->mux->shift,
                                cfg->mux->width,
@@ -410,7 +410,7 @@ static void get_cfg_composite_div(const struct composite_clk_gcfg *gcfg,
                }
        }
 
-       if (gcfg->gate && gcfg->gate) {
+       if (gcfg->gate && cfg->gate) {
                gate = _get_cgate(base + cfg->gate->offset,
                                cfg->gate->bit_idx,
                                gcfg->gate->flags, lock);