summaryrefslogtreecommitdiff
path: root/drivers/clk/clk-stm32h7.c
diff options
context:
space:
mode:
authorGabriel Fernandez <gabriel.fernandez@st.com>2017-10-11 08:57:24 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-12-14 09:53:11 +0100
commit8474be654b2723426f37ad95a48bff1acdb022f7 (patch)
treebea274e8860f7d1209e143aadc643948a15debb5 /drivers/clk/clk-stm32h7.c
parentb316280c81337971e5cbf239400186425de7bae9 (diff)
clk: stm32h7: fix test of clock config
[ 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>
Diffstat (limited to 'drivers/clk/clk-stm32h7.c')
-rw-r--r--drivers/clk/clk-stm32h7.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clk/clk-stm32h7.c b/drivers/clk/clk-stm32h7.c
index a94c3f56c590..61c3e40507d3 100644
--- a/drivers/clk/clk-stm32h7.c
+++ b/drivers/clk/clk-stm32h7.c
@@ -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);