diff options
| author | Michael Turquette <mturquette@baylibre.com> | 2016-07-21 17:30:54 -0700 |
|---|---|---|
| committer | Michael Turquette <mturquette@baylibre.com> | 2016-07-21 17:30:54 -0700 |
| commit | d22527fed2f094c2e4f9a66f35b68a090c3d906a (patch) | |
| tree | 4c234f16ec9ca21c48e33ae0edd373d3b6b5d52a /drivers/clk/sunxi/clk-sun4i-tcon-ch1.c | |
| parent | b328d2c110ad7b45af9cde2bce70803df28e9553 (diff) | |
| parent | f96423f483b1a7854270335b319e8d1cdd6f3585 (diff) | |
Merge branch 'clk-fixes' into clk-next
Diffstat (limited to 'drivers/clk/sunxi/clk-sun4i-tcon-ch1.c')
| -rw-r--r-- | drivers/clk/sunxi/clk-sun4i-tcon-ch1.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/clk/sunxi/clk-sun4i-tcon-ch1.c b/drivers/clk/sunxi/clk-sun4i-tcon-ch1.c index 98a4582de56a..b6d29d1bedca 100644 --- a/drivers/clk/sunxi/clk-sun4i-tcon-ch1.c +++ b/drivers/clk/sunxi/clk-sun4i-tcon-ch1.c @@ -79,15 +79,11 @@ static int tcon_ch1_is_enabled(struct clk_hw *hw) static u8 tcon_ch1_get_parent(struct clk_hw *hw) { struct tcon_ch1_clk *tclk = hw_to_tclk(hw); - int num_parents = clk_hw_get_num_parents(hw); u32 reg; reg = readl(tclk->reg) >> TCON_CH1_SCLK2_MUX_SHIFT; reg &= reg >> TCON_CH1_SCLK2_MUX_MASK; - if (reg >= num_parents) - return -EINVAL; - return reg; } |