summaryrefslogtreecommitdiffstats
path: root/drivers/clk
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-03-01 14:12:01 +0100
committerArnd Bergmann <arnd@arndb.de>2013-03-14 22:34:26 +0100
commitd6d1053a8bbf75e5eb6ef29ddcf87e66421763c4 (patch)
treeb5c244892c8ec7225b87b46db030c8ca5a62fa92 /drivers/clk
parent7b59496c11747cd715995874177dafd50c8a0115 (diff)
downloadop-kernel-dev-d6d1053a8bbf75e5eb6ef29ddcf87e66421763c4.zip
op-kernel-dev-d6d1053a8bbf75e5eb6ef29ddcf87e66421763c4.tar.gz
clk: vt8500: Fix "fix device clock divisor calculations"
Patch 72480014b8 "Fix device clock divisor calculations" was apparently rebased incorrectly before it got upstream, causing a build error. Replacing the "prate" pointer with the local parent_rate is most likely the correct solution. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: Tony Prisk <linux@prisktech.co.nz> Cc: Mike Turquette <mturquette@linaro.org>
Diffstat (limited to 'drivers/clk')
-rw-r--r--drivers/clk/clk-vt8500.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/clk-vt8500.c b/drivers/clk/clk-vt8500.c
index b5538bb..09c6331 100644
--- a/drivers/clk/clk-vt8500.c
+++ b/drivers/clk/clk-vt8500.c
@@ -157,7 +157,7 @@ static int vt8500_dclk_set_rate(struct clk_hw *hw, unsigned long rate,
divisor = parent_rate / rate;
/* If prate / rate would be decimal, incr the divisor */
- if (rate * divisor < *prate)
+ if (rate * divisor < parent_rate)
divisor++;
if (divisor == cdev->div_mask + 1)
OpenPOWER on IntegriCloud