diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-02-09 22:52:35 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-02-09 22:52:35 +0100 |
| commit | 40e993aa04fc44ee426b27e86186b95c130f6630 (patch) | |
| tree | fdf1e9e08e1c5ba4a1f302c4a61b7be37865b5a7 /arch | |
| parent | b1e9a64972bfecd2f3dc5eb816781fa4ef28007a (diff) | |
| parent | 0764c604c8128f17fd740ff8b1701d0a1301eb7e (diff) | |
| download | linux-40e993aa04fc44ee426b27e86186b95c130f6630.tar.gz linux-40e993aa04fc44ee426b27e86186b95c130f6630.tar.bz2 linux-40e993aa04fc44ee426b27e86186b95c130f6630.zip | |
Merge OPP material for v4.11 to satisfy dependencies.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-omap2/pm.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c index 76b0454ddc49..0598630c1778 100644 --- a/arch/arm/mach-omap2/pm.c +++ b/arch/arm/mach-omap2/pm.c @@ -130,17 +130,16 @@ static int __init omap2_set_init_voltage(char *vdd_name, char *clk_name, freq = clk_get_rate(clk); clk_put(clk); - rcu_read_lock(); opp = dev_pm_opp_find_freq_ceil(dev, &freq); if (IS_ERR(opp)) { - rcu_read_unlock(); pr_err("%s: unable to find boot up OPP for vdd_%s\n", __func__, vdd_name); goto exit; } bootup_volt = dev_pm_opp_get_voltage(opp); - rcu_read_unlock(); + dev_pm_opp_put(opp); + if (!bootup_volt) { pr_err("%s: unable to find voltage corresponding to the bootup OPP for vdd_%s\n", __func__, vdd_name); |