UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'pm-opp' 

* pm-opp:
  PM / OPP: remove double calls to find_device_opp()
  PM / OPP: set new_opp->dev_opp to a valid dev_opp
This commit is contained in:
Rafael J. Wysocki 2014-12-10 22:17:25 +01:00
parent fc813e50d3 2a6127d037
commit dec6c26b6e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/base/power/opp.c
View File

@ -400,7 +400,6 @@ static int dev_pm_opp_add_dynamic(struct device *dev, unsigned long freq,
mutex_lock(&dev_opp_list_lock); mutex_lock(&dev_opp_list_lock);
/* populate the opp table */ /* populate the opp table */
new_opp->dev_opp = dev_opp;
new_opp->rate = freq; new_opp->rate = freq;
new_opp->u_volt = u_volt; new_opp->u_volt = u_volt;
new_opp->available = true; new_opp->available = true;
@ -460,6 +459,7 @@ static int dev_pm_opp_add_dynamic(struct device *dev, unsigned long freq,
} }
list_add: list_add:
new_opp->dev_opp = dev_opp;
list_add_rcu(&new_opp->node, head); list_add_rcu(&new_opp->node, head);
mutex_unlock(&dev_opp_list_lock); mutex_unlock(&dev_opp_list_lock);
@ -768,7 +768,7 @@ EXPORT_SYMBOL_GPL(of_init_opp_table);
*/ */
void of_free_opp_table(struct device *dev) void of_free_opp_table(struct device *dev)
{ {
struct device_opp *dev_opp = find_device_opp(dev); struct device_opp *dev_opp;
struct dev_pm_opp *opp, *tmp; struct dev_pm_opp *opp, *tmp;
/* Check for existing list for 'dev' */ /* Check for existing list for 'dev' */