summaryrefslogtreecommitdiff
path: root/drivers/clk/qcom/clk-debug.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/clk/qcom/clk-debug.c')
-rw-r--r--drivers/clk/qcom/clk-debug.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/clk/qcom/clk-debug.c b/drivers/clk/qcom/clk-debug.c
index 50d0d01188ed..496b80eace5b 100644
--- a/drivers/clk/qcom/clk-debug.c
+++ b/drivers/clk/qcom/clk-debug.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013-2014, 2016-2017,
+ * Copyright (c) 2013-2014, 2016-2017, 2020,
*
* The Linux Foundation. All rights reserved.
*
@@ -177,13 +177,12 @@ static int clk_debug_mux_set_parent(struct clk_hw *hw, u8 index)
regval |= (meas->parent[index].next_sel & meas->mask);
- if (meas->parent[index].en_mask == 0xFF)
- /* Skip en_mask */
- regval = regval;
- else if (meas->parent[index].en_mask)
- regval |= meas->parent[index].en_mask;
- else
- regval |= meas->en_mask;
+ if (meas->parent[index].en_mask != 0xFF) {
+ if (meas->parent[index].en_mask)
+ regval |= meas->parent[index].en_mask;
+ else
+ regval |= meas->en_mask;
+ }
regmap_write(meas->regmap[dbg_cc], 0x0, regval);
}