diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-10-08 08:44:55 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-10-08 08:44:55 +0200 |
| commit | c2dc121c6499080dba3df12e05fb1d27fe1c4e45 (patch) | |
| tree | fffcfefbcd44cb4897e284370df4d84f30062460 /drivers/opp/core.c | |
| parent | Merge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | PM / OPP: _of_add_opp_table_v2(): increment count only if OPP is added (diff) | |
| download | linux-c2dc121c6499080dba3df12e05fb1d27fe1c4e45.tar.gz linux-c2dc121c6499080dba3df12e05fb1d27fe1c4e45.zip | |
Merge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm into pm-opp
Pull more operating performance points (OPP) framework updates for 4.20
from Viresh Kumar:
"That contains some important fixes reported recently."
* 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm:
PM / OPP: _of_add_opp_table_v2(): increment count only if OPP is added
cpufreq: dt: Try freeing static OPPs only if we have added them
OPP: Return error on error from dev_pm_opp_get_opp_count()
OPP: Improve error handling in dev_pm_opp_of_cpumask_add_table()
Diffstat (limited to 'drivers/opp/core.c')
| -rw-r--r-- | drivers/opp/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/opp/core.c b/drivers/opp/core.c index cdf918aaac34..2c2df4e4fc14 100644 --- a/drivers/opp/core.c +++ b/drivers/opp/core.c @@ -318,7 +318,7 @@ int dev_pm_opp_get_opp_count(struct device *dev) count = PTR_ERR(opp_table); dev_dbg(dev, "%s: OPP table not found (%d)\n", __func__, count); - return 0; + return count; } count = _get_opp_count(opp_table); |