Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 030e3250 authored by Viresh Kumar's avatar Viresh Kumar Committed by Alex Shi
Browse files

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: 4eafbd15b6c8 ("PM / OPP: add dev_pm_opp_get_suspend_opp() helper")
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
(cherry picked from commit 1b2b90cbea00670221f062814dc8bcecb3af7b90)
Signed-off-by: default avatarAlex Shi <alex.shi@linaro.org>
parent 7aa5285e

drivers/base/power/opp.c

+5 −7
Original line number Diff line number Diff line
@@ -345,7 +345,7 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_get_max_clock_latency); 
 * @dev:	device for which we do this operation

 *

 * 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

 * 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 device_opp *dev_opp;

	struct dev_pm_opp *opp;



	opp_rcu_lockdep_assert();



	dev_opp = _find_device_opp(dev);

	if (IS_ERR(dev_opp))

		opp = NULL;

	else

		opp = dev_opp->suspend_opp;

	if (IS_ERR(dev_opp) || !dev_opp->suspend_opp ||

	    !dev_opp->suspend_opp->available)

		return NULL;



	return opp;

	return dev_opp->suspend_opp;

}

EXPORT_SYMBOL_GPL(dev_pm_opp_get_suspend_opp);