]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
clk: vt8500: Fix "fix device clock divisor calculations"
authorArnd Bergmann <arnd@arndb.de>
Fri, 1 Mar 2013 13:12:01 +0000 (14:12 +0100)
committerArnd Bergmann <arnd@arndb.de>
Thu, 14 Mar 2013 21:34:26 +0000 (22:34 +0100)
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>
drivers/clk/clk-vt8500.c

index b5538bba7a10b84581c70d51357a8e360fc81545..09c63315e57979f8d726f627279f0e5e88e94c3f 100644 (file)
@@ -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)