diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-08-10 23:21:57 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-08-10 23:21:57 -0700 |
| commit | cf835e8d226481984f72dffc6034fe75e296511e (patch) | |
| tree | 4268b2e82c7e8a03c63375bd51f4287fcbf45f15 /drivers/cpufreq/omap-cpufreq.c | |
| parent | 90f7f9acecc6dde87cf25db1ad7599926d6773f7 (diff) | |
| parent | 196449de0c886e64b48d01bd7ee153656db92884 (diff) | |
| download | blackbird-obmc-linux-cf835e8d226481984f72dffc6034fe75e296511e.tar.gz blackbird-obmc-linux-cf835e8d226481984f72dffc6034fe75e296511e.zip | |
Merge branch 'for_3.6/fixes/pm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into fixes
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; |
