diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2015-11-03 08:24:40 +0100 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2015-11-03 08:24:40 +0100 |
| commit | c75960aa7a4ef09bb768fa474071f4190adae49c (patch) | |
| tree | f2bae724550db82264c525d9edfdec8705327817 /drivers/base | |
| parent | Linux 4.3-rc4 (diff) | |
| parent | thermal: underflow bug in imx_set_trip_temp() (diff) | |
| download | linux-c75960aa7a4ef09bb768fa474071f4190adae49c.tar.xz linux-c75960aa7a4ef09bb768fa474071f4190adae49c.zip | |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal into thermal-soc
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/power/opp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/base/power/opp.c b/drivers/base/power/opp.c index 7ae7cd990fbf..480e545e0208 100644 --- a/drivers/base/power/opp.c +++ b/drivers/base/power/opp.c @@ -217,7 +217,7 @@ static struct device_opp *_find_device_opp(struct device *dev) } /** - * dev_pm_opp_get_voltage() - Gets the voltage corresponding to an available opp + * dev_pm_opp_get_voltage() - Gets the voltage corresponding to an opp * @opp: opp for which voltage has to be returned for * * Return: voltage in micro volt corresponding to the opp, else @@ -239,7 +239,7 @@ unsigned long dev_pm_opp_get_voltage(struct dev_pm_opp *opp) opp_rcu_lockdep_assert(); tmp_opp = rcu_dereference(opp); - if (IS_ERR_OR_NULL(tmp_opp) || !tmp_opp->available) + if (IS_ERR_OR_NULL(tmp_opp)) pr_err("%s: Invalid parameters\n", __func__); else v = tmp_opp->u_volt; |