diff options
| author | Chander Kashyap <chander.kashyap@linaro.org> | 2014-05-16 16:21:17 +0530 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-30 20:11:59 -0700 |
| commit | 703d671298a54a293776aa88474b601fc480292a (patch) | |
| tree | a067881ca021e6b09a1ec849133efffc075a39b3 | |
| parent | d4a06c59dfeb4012c13a113a450de5cc07dbad36 (diff) | |
PM / OPP: fix incorrect OPP count handling in of_init_opp_table
commit 086abb58590a4df73e8a6ed71fd418826937cd46 upstream.
In of_init_opp_table function, if a failure to add an OPP is
detected, the count of OPPs, yet to be added is not updated.
Fix this by decrementing this count on failure as well.
Signed-off-by: Chander Kashyap <k.chander@samsung.com>
Signed-off-by: Inderpal Singh <inderpal.s@samsung.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Acked-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/base/power/opp.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/base/power/opp.c b/drivers/base/power/opp.c index fa4187418440..08d99ef60b70 100644 --- a/drivers/base/power/opp.c +++ b/drivers/base/power/opp.c @@ -735,11 +735,9 @@ int of_init_opp_table(struct device *dev) unsigned long freq = be32_to_cpup(val++) * 1000; unsigned long volt = be32_to_cpup(val++); - if (dev_pm_opp_add(dev, freq, volt)) { + if (dev_pm_opp_add(dev, freq, volt)) dev_warn(dev, "%s: Failed to add OPP %ld\n", __func__, freq); - continue; - } nr -= 2; } |