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

Commit 7284a00f authored by Viresh Kumar's avatar Viresh Kumar Committed by Rafael J. Wysocki
Browse files

PM / OPP: set new_opp->dev_opp to a valid dev_opp 



We find/allocate dev_opp after using its value to fill new_opp->dev_opp right
now. Move this to a later point where dev_opp is valid.

Fixes: a7470db6 (PM / OPP don't match for existing OPPs when list is empty)
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent b4037aaa

drivers/base/power/opp.c

+1 −1
Original line number Diff line number Diff line
@@ -400,7 +400,6 @@ static int dev_pm_opp_add_dynamic(struct device *dev, unsigned long freq, 
	mutex_lock(&dev_opp_list_lock);



	/* populate the opp table */

	new_opp->dev_opp = dev_opp;

	new_opp->rate = freq;

	new_opp->u_volt = u_volt;

	new_opp->available = true;
@@ -460,6 +459,7 @@ static int dev_pm_opp_add_dynamic(struct device *dev, unsigned long freq, 
	}



list_add:

	new_opp->dev_opp = dev_opp;

	list_add_rcu(&new_opp->node, head);

	mutex_unlock(&dev_opp_list_lock);