diff options
author | Juha Tukkinen <jtukkinen@nvidia.com> | 2012-06-14 17:44:34 +0300 |
---|---|---|
committer | Simone Willett <swillett@nvidia.com> | 2012-06-18 18:52:21 -0700 |
commit | 9923fdb793c254e9787cdae56cc0c4e4529f3c52 (patch) | |
tree | 843d70e5acba2bb984a33896e1849c16f8447e7a | |
parent | 6cc2ba059bc9760f185834e67d9456af36bf5a9f (diff) |
ARM: tegra: dvfs: Fix error checking of voltage
Fix error checking of predicted voltage. Also get rid of
maybe-uninitialized warning when using 4.6 toolchain.
Bug 949219
Bug 999222
Change-Id: I47553aba5a93c91bdd93cbf75081d69f92aec4dd
Signed-off-by: Juha Tukkinen <jtukkinen@nvidia.com>
Reviewed-on: http://git-master/r/108899
Reviewed-by: Simone Willett <swillett@nvidia.com>
Tested-by: Simone Willett <swillett@nvidia.com>
-rw-r--r-- | arch/arm/mach-tegra/tegra3_dvfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/tegra3_dvfs.c b/arch/arm/mach-tegra/tegra3_dvfs.c index 392a5237e08d..2f8e384f6e68 100644 --- a/arch/arm/mach-tegra/tegra3_dvfs.c +++ b/arch/arm/mach-tegra/tegra3_dvfs.c @@ -917,7 +917,7 @@ void tegra_dvfs_core_cap_level_set(int level) static int __init init_core_cap_one(struct clk *c, unsigned long *freqs) { - int i, v, next_v; + int i, v, next_v = 0; unsigned long rate, next_rate = 0; for (i = 0; i < ARRAY_SIZE(core_millivolts); i++) { @@ -938,7 +938,7 @@ static int __init init_core_cap_one(struct clk *c, unsigned long *freqs) next_v = tegra_dvfs_predict_millivolts( c->parent, next_rate); - if (IS_ERR_VALUE(next_rate)) { + if (IS_ERR_VALUE(next_v)) { pr_debug("tegra3_dvfs: failed to predict %s mV" " for rate %lu", c->name, next_rate); return -EINVAL; |