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/sprd | |
| parent | 0003046477a0c0038bab8c899181faa2e7d86d40 (diff) | |
| parent | 12a26c298d2a8b1cab498533fa65198e49e3afd3 (diff) | |
| download | linux-716d9b1d4a88493ec3e52957cc1026d32534ee67.tar.gz linux-716d9b1d4a88493ec3e52957cc1026d32534ee67.tar.bz2 linux-716d9b1d4a88493ec3e52957cc1026d32534ee67.zip | |
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/sprd')
| -rw-r--r-- | drivers/clk/sprd/div.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/clk/sprd/div.c b/drivers/clk/sprd/div.c index 887a8633fdc9..7621a1d1ab9c 100644 --- a/drivers/clk/sprd/div.c +++ b/drivers/clk/sprd/div.c @@ -39,7 +39,8 @@ unsigned long sprd_div_helper_recalc_rate(struct sprd_clk_common *common, val = reg >> div->shift; val &= (1 << div->width) - 1; - return divider_recalc_rate(&common->hw, parent_rate, val, NULL, 0); + return divider_recalc_rate(&common->hw, parent_rate, val, NULL, 0, + div->width); } EXPORT_SYMBOL_GPL(sprd_div_helper_recalc_rate); |