diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2018-01-26 16:42:03 -0800 |
|---|---|---|
| committer | Stephen Boyd <sboyd@codeaurora.org> | 2018-01-26 16:43:14 -0800 |
| commit | 716d9b1d4a88493ec3e52957cc1026d32534ee67 (patch) | |
| tree | f1f9c9d73a5527e23e1a476cb2acbdad9e81f09f /drivers/clk/sunxi-ng | |
| parent | 0003046477a0c0038bab8c899181faa2e7d86d40 (diff) | |
| parent | 12a26c298d2a8b1cab498533fa65198e49e3afd3 (diff) | |
| download | linux-716d9b1d4a88493ec3e52957cc1026d32534ee67.tar.gz | |
Merge branch 'clk-divider-container' into clk-next
* clk-divider-container:
clk: divider: fix incorrect usage of container_of
Plus fixup sprd/div.c to pass the width too.
Diffstat (limited to 'drivers/clk/sunxi-ng')
| -rw-r--r-- | drivers/clk/sunxi-ng/ccu_div.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/sunxi-ng/ccu_div.c b/drivers/clk/sunxi-ng/ccu_div.c index baa3cf96507b..302a18efd39f 100644 --- a/drivers/clk/sunxi-ng/ccu_div.c +++ b/drivers/clk/sunxi-ng/ccu_div.c @@ -71,7 +71,7 @@ static unsigned long ccu_div_recalc_rate(struct clk_hw *hw, parent_rate); val = divider_recalc_rate(hw, parent_rate, val, cd->div.table, - cd->div.flags); + cd->div.flags, cd->div.width); if (cd->common.features & CCU_FEATURE_FIXED_POSTDIV) val /= cd->fixed_post_div; |