diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-05 14:05:11 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-05 14:05:11 +0200 |
| commit | 75d8f2931a803b803cb4a850448460475c20f30b (patch) | |
| tree | 9853b9084fa55609c8e4abbc1763bc500e05da50 /drivers/cpufreq/omap-cpufreq.c | |
| parent | ASoC: Davinci: evm: Fix typo in cpu dai name (diff) | |
| parent | ASoC: omap-mcbsp: Fix compilation error due to leftover code (diff) | |
| download | linux-75d8f2931a803b803cb4a850448460475c20f30b.tar.xz linux-75d8f2931a803b803cb4a850448460475c20f30b.zip | |
Merge branch 'asoc-omap' into for-3.7
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; |