diff options
| author | Mark Brown <broonie@linaro.org> | 2014-07-01 11:21:48 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-07-01 11:21:48 +0100 |
| commit | bab66e96641aeadf263ec443dbcc57090a664dea (patch) | |
| tree | 5aacb65407cf1ed65b28267b8a08a1d0b5408a91 /drivers/base | |
| parent | 6056dff4c5196b7c7a24ba6079155e400074cdf3 (diff) | |
| parent | 80f04edd1db9e64fc5310130b9b2c95b965ec9c9 (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-android
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; } |