Commit 4ba16aa1 authored by Dave Jones's avatar Dave Jones

[CPUFREQ] propagate longhaul_get_ranges() failure up if something went wrong.

parent 179d71b9
...@@ -526,6 +526,7 @@ static int longhaul_target (struct cpufreq_policy *policy, ...@@ -526,6 +526,7 @@ static int longhaul_target (struct cpufreq_policy *policy,
static int longhaul_cpu_init (struct cpufreq_policy *policy) static int longhaul_cpu_init (struct cpufreq_policy *policy)
{ {
struct cpuinfo_x86 *c = cpu_data; struct cpuinfo_x86 *c = cpu_data;
int ret;
switch (c->x86_model) { switch (c->x86_model) {
case 6: /* VIA C3 Samuel C5A */ case 6: /* VIA C3 Samuel C5A */
...@@ -556,7 +557,6 @@ static int longhaul_cpu_init (struct cpufreq_policy *policy) ...@@ -556,7 +557,6 @@ static int longhaul_cpu_init (struct cpufreq_policy *policy)
memcpy (clock_ratio, longhaul3_clock_ratio, sizeof(longhaul3_clock_ratio)); memcpy (clock_ratio, longhaul3_clock_ratio, sizeof(longhaul3_clock_ratio));
memcpy (eblcr_table, c5m_eblcr, sizeof(c5m_eblcr)); memcpy (eblcr_table, c5m_eblcr, sizeof(c5m_eblcr));
break; break;
} }
printk (KERN_INFO "longhaul: VIA CPU detected. Longhaul version %d supported\n", longhaul); printk (KERN_INFO "longhaul: VIA CPU detected. Longhaul version %d supported\n", longhaul);
...@@ -568,8 +568,9 @@ static int longhaul_cpu_init (struct cpufreq_policy *policy) ...@@ -568,8 +568,9 @@ static int longhaul_cpu_init (struct cpufreq_policy *policy)
longhaul_setup_voltagescaling (lo, hi); longhaul_setup_voltagescaling (lo, hi);
} }
if (longhaul_get_ranges()) ret = longhaul_get_ranges();
return -ENOMEM; if (ret != 0)
return ret;
policy->policy = CPUFREQ_POLICY_PERFORMANCE; policy->policy = CPUFREQ_POLICY_PERFORMANCE;
policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL; policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment