diff options
| author | Rajendra Nayak <rnayak@ti.com> | 2012-08-09 12:38:21 +0530 |
|---|---|---|
| committer | Kevin Hilman <khilman@ti.com> | 2012-08-09 08:07:47 -0700 |
| commit | 1b8652142334a8c0729c5c4536a22cfc6fc49297 (patch) | |
| tree | af0cfa1b7d2c86221fb141b91f9d1cdf85022992 /drivers/cpufreq/omap-cpufreq.c | |
| parent | 5b6e3eb576e8ad03264d46982afed77bdc6323a3 (diff) | |
| download | talos-op-linux-1b8652142334a8c0729c5c4536a22cfc6fc49297.tar.gz talos-op-linux-1b8652142334a8c0729c5c4536a22cfc6fc49297.zip | |
cpufreq: OMAP: Handle missing frequency table on SMP systems
On OMAP4, if the first CPU fails to get a valid frequency table (this
could happen if the platform does not register any OPP table), the
subsequent CPU instances end up dealing with a NULL freq_table and
crash.
Check for an already existing freq_table, before trying to create one,
and increment the freq_table_users only if the table is sucessfully
created.
Signed-off-by: Rajendra Nayak <rnayak@ti.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Cc: <linux-pm@vger.kernel.org>
Signed-off-by: Kevin Hilman <khilman@ti.com>
Diffstat (limited to 'drivers/cpufreq/omap-cpufreq.c')
| -rw-r--r-- | drivers/cpufreq/omap-cpufreq.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/cpufreq/omap-cpufreq.c b/drivers/cpufreq/omap-cpufreq.c index 17fa04d08be9..b47034e650a5 100644 --- a/drivers/cpufreq/omap-cpufreq.c +++ b/drivers/cpufreq/omap-cpufreq.c @@ -218,7 +218,7 @@ static int __cpuinit omap_cpu_init(struct cpufreq_policy *policy) policy->cur = policy->min = policy->max = omap_getspeed(policy->cpu); - if (atomic_inc_return(&freq_table_users) == 1) + if (!freq_table) result = opp_init_cpufreq_table(mpu_dev, &freq_table); if (result) { @@ -227,6 +227,8 @@ static int __cpuinit omap_cpu_init(struct cpufreq_policy *policy) goto fail_ck; } + atomic_inc_return(&freq_table_users); + result = cpufreq_frequency_table_cpuinfo(policy, freq_table); if (result) goto fail_table; |
