PM / OPP: Return suspend_opp only if it is enabled
There is no point returning suspend_opp, if it is disabled by the core.
As we can't use it at all. Fix it.
Fixes: 4eafbd15b6
("PM / OPP: add dev_pm_opp_get_suspend_opp() helper")
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Родитель
4eafbd15b6
Коммит
1b2b90cbea
|
@ -345,7 +345,7 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_get_max_clock_latency);
|
||||||
* @dev: device for which we do this operation
|
* @dev: device for which we do this operation
|
||||||
*
|
*
|
||||||
* Return: This function returns pointer to the suspend opp if it is
|
* Return: This function returns pointer to the suspend opp if it is
|
||||||
* defined, otherwise it returns NULL.
|
* defined and available, otherwise it returns NULL.
|
||||||
*
|
*
|
||||||
* Locking: This function must be called under rcu_read_lock(). opp is a rcu
|
* Locking: This function must be called under rcu_read_lock(). opp is a rcu
|
||||||
* protected pointer. The reason for the same is that the opp pointer which is
|
* protected pointer. The reason for the same is that the opp pointer which is
|
||||||
|
@ -356,17 +356,15 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_get_max_clock_latency);
|
||||||
struct dev_pm_opp *dev_pm_opp_get_suspend_opp(struct device *dev)
|
struct dev_pm_opp *dev_pm_opp_get_suspend_opp(struct device *dev)
|
||||||
{
|
{
|
||||||
struct device_opp *dev_opp;
|
struct device_opp *dev_opp;
|
||||||
struct dev_pm_opp *opp;
|
|
||||||
|
|
||||||
opp_rcu_lockdep_assert();
|
opp_rcu_lockdep_assert();
|
||||||
|
|
||||||
dev_opp = _find_device_opp(dev);
|
dev_opp = _find_device_opp(dev);
|
||||||
if (IS_ERR(dev_opp))
|
if (IS_ERR(dev_opp) || !dev_opp->suspend_opp ||
|
||||||
opp = NULL;
|
!dev_opp->suspend_opp->available)
|
||||||
else
|
return NULL;
|
||||||
opp = dev_opp->suspend_opp;
|
|
||||||
|
|
||||||
return opp;
|
return dev_opp->suspend_opp;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(dev_pm_opp_get_suspend_opp);
|
EXPORT_SYMBOL_GPL(dev_pm_opp_get_suspend_opp);
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче