diff options
| author | Mark Brown <broonie@linaro.org> | 2014-07-01 11:20:17 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-07-01 11:20:17 +0100 |
| commit | 80f04edd1db9e64fc5310130b9b2c95b965ec9c9 (patch) | |
| tree | e11c306c70eda44b6a893b42d04d2bcc6e991249 /drivers/base | |
| parent | ab58e812c6d8def5fce2763fc7fdda3751047beb (diff) | |
| parent | bbae7add628cfe96a1facd578dd1eddcd1030de7 (diff) | |
Merge tag 'v3.14.10' into linux-linaro-lsk-v3.14
This is the 3.14.10 stable release
Diffstat (limited to 'drivers/base')
| -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; } |