Skip to content

Commit

Permalink
ARM: shmobile: mackerel: clk_round_rate() can return a zero to indica…
Browse files Browse the repository at this point in the history
…te an error

Treat both negative and zero return values from clk_round_rate() as
errors.  This is needed since subsequent patches will convert
clk_round_rate()'s return value to be an unsigned type, rather than a
signed type, since some clock sources can generate rates higher than
(2^31)-1 Hz.

Eventually, when calling clk_round_rate(), only a return value of zero
will be considered a error.  All other values will be considered valid
rates.  The comparison against values less than 0 is kept to preserve
the correct behavior in the meantime.

Signed-off-by: Paul Walmsley <pwalmsley@nvidia.com>
Acked-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
  • Loading branch information
Paul Walmsley authored and Simon Horman committed Dec 10, 2013
1 parent 85ef14d commit 90d423f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions arch/arm/mach-shmobile/board-mackerel.c
Original file line number Diff line number Diff line change
Expand Up @@ -548,9 +548,9 @@ static void __init hdmi_init_pm_clock(void)
clk_get_rate(&sh7372_pllc2_clk));

rate = clk_round_rate(&sh7372_pllc2_clk, 594000000);
if (rate < 0) {
if (rate <= 0) {
pr_err("Cannot get suitable rate: %ld\n", rate);
ret = rate;
ret = -EINVAL;
goto out;
}

Expand Down

0 comments on commit 90d423f

Please sign in to comment.