diff options
author | Paul Walmsley <pwalmsley@nvidia.com> | 2013-11-26 19:49:38 -0500 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2013-12-10 03:24:28 -0500 |
commit | 90d423faa0ed53cfda9f12d119f6938dd1ab515d (patch) | |
tree | dee3af42b9b97bc26a26182adce343a2317736ac /arch | |
parent | 85ef14da7337ba2c9b9fc489637e3db3b956b5a0 (diff) |
ARM: shmobile: mackerel: clk_round_rate() can return a zero to indicate 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>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-shmobile/board-mackerel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c index af06753eb809..d90d2f11071b 100644 --- a/arch/arm/mach-shmobile/board-mackerel.c +++ b/arch/arm/mach-shmobile/board-mackerel.c | |||
@@ -548,9 +548,9 @@ static void __init hdmi_init_pm_clock(void) | |||
548 | clk_get_rate(&sh7372_pllc2_clk)); | 548 | clk_get_rate(&sh7372_pllc2_clk)); |
549 | 549 | ||
550 | rate = clk_round_rate(&sh7372_pllc2_clk, 594000000); | 550 | rate = clk_round_rate(&sh7372_pllc2_clk, 594000000); |
551 | if (rate < 0) { | 551 | if (rate <= 0) { |
552 | pr_err("Cannot get suitable rate: %ld\n", rate); | 552 | pr_err("Cannot get suitable rate: %ld\n", rate); |
553 | ret = rate; | 553 | ret = -EINVAL; |
554 | goto out; | 554 | goto out; |
555 | } | 555 | } |
556 | 556 | ||