From cb9b777e45c73856d3ddbec8bf03071b058677f7 Mon Sep 17 00:00:00 2001 From: Nishanth Menon Date: Fri, 18 Jan 2013 19:52:32 +0000 Subject: [PATCH] --- yaml --- r: 349079 b: refs/heads/master c: f44d188acdca1a34e4439ca6a173f85086e0e655 h: refs/heads/master i: 349077: 73cb929841c8acc7fcab4e61c964f585dda324bf 349075: ee7de6a4e4d8be8f7efa7ef5ddfc2e6093a0fd51 349071: b9ddeb184ba1a1fd9bda2e69d7e7ea25a3252f63 v: v3 --- [refs] | 2 +- trunk/drivers/cpufreq/omap-cpufreq.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a1de78672cf3..825de33366a1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 25216865392a6e1f3032855aee7407de1fe0b70c +refs/heads/master: f44d188acdca1a34e4439ca6a173f85086e0e655 diff --git a/trunk/drivers/cpufreq/omap-cpufreq.c b/trunk/drivers/cpufreq/omap-cpufreq.c index 1f3417a8322d..97102b05843f 100644 --- a/trunk/drivers/cpufreq/omap-cpufreq.c +++ b/trunk/drivers/cpufreq/omap-cpufreq.c @@ -110,13 +110,16 @@ static int omap_target(struct cpufreq_policy *policy, freq = ret; if (mpu_reg) { + rcu_read_lock(); opp = opp_find_freq_ceil(mpu_dev, &freq); if (IS_ERR(opp)) { + rcu_read_unlock(); dev_err(mpu_dev, "%s: unable to find MPU OPP for %d\n", __func__, freqs.new); return -EINVAL; } volt = opp_get_voltage(opp); + rcu_read_unlock(); tol = volt * OPP_TOLERANCE / 100; volt_old = regulator_get_voltage(mpu_reg); }