diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-11 00:17:25 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-11 00:17:25 +0300 |
| commit | dec6c26b6ebdbfb03b5abaf399434169935cb996 (patch) | |
| tree | 0eaa30636c04077906ad368ab7e8b8ed73765691 /drivers/base | |
| parent | fc813e50d3a43bc5d2527384fcb76519c6808986 (diff) | |
| parent | 2a6127d037de96e8add0b09e0200b331a4db54be (diff) | |
| download | linux-dec6c26b6ebdbfb03b5abaf399434169935cb996.tar.xz | |
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
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 2d195f3a1998..1bbef8e838e7 100644 --- a/drivers/base/power/opp.c +++ b/drivers/base/power/opp.c @@ -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); @@ -768,7 +768,7 @@ EXPORT_SYMBOL_GPL(of_init_opp_table); */ 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; /* Check for existing list for 'dev' */ |