diff options
| author | Michael Turquette | 2016-07-22 02:30:54 +0200 |
|---|---|---|
| committer | Michael Turquette | 2016-07-22 02:30:54 +0200 |
| commit | d22527fed2f094c2e4f9a66f35b68a090c3d906a (patch) | |
| tree | 4c234f16ec9ca21c48e33ae0edd373d3b6b5d52a /drivers/clk/at91 | |
| parent | clk: Makefile: re-sort and clean up (diff) | |
| parent | clk: at91: fix clk_programmable_set_parent() (diff) | |
| download | kernel-qcow2-linux-d22527fed2f094c2e4f9a66f35b68a090c3d906a.tar.gz kernel-qcow2-linux-d22527fed2f094c2e4f9a66f35b68a090c3d906a.tar.xz kernel-qcow2-linux-d22527fed2f094c2e4f9a66f35b68a090c3d906a.zip | |
Merge branch 'clk-fixes' into clk-next
Diffstat (limited to 'drivers/clk/at91')
| -rw-r--r-- | drivers/clk/at91/clk-programmable.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/at91/clk-programmable.c b/drivers/clk/at91/clk-programmable.c index 10f846cc8db1..25d5906640c3 100644 --- a/drivers/clk/at91/clk-programmable.c +++ b/drivers/clk/at91/clk-programmable.c @@ -99,7 +99,7 @@ static int clk_programmable_set_parent(struct clk_hw *hw, u8 index) struct clk_programmable *prog = to_clk_programmable(hw); const struct clk_programmable_layout *layout = prog->layout; unsigned int mask = layout->css_mask; - unsigned int pckr = 0; + unsigned int pckr = index; if (layout->have_slck_mck) mask |= AT91_PMC_CSSMCK_MCK; |