diff options
author | Dave Jones <davej@redhat.com> | 2006-08-27 04:23:35 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-27 14:01:29 -0400 |
commit | a0cc621f52a4dea10c34eeed6eb4e36b26db63dc (patch) | |
tree | 3a23829236cf7a613f2dfe429f867a467f3cde6a /arch | |
parent | f8986c241dfd54d51c9eff967129a550ae230144 (diff) |
[PATCH] cpufreq: acpi-cpufreq: Ignore failure from acpi_cpufreq_early_init_acpi
Ignore the return value of early_init_acpi(), as it can give false error
messages. If there is something really wrong, then register_driver will
fail cleanly with EINVAL later.
[ background: modprobe acpi-cpufreq on systems not capable of speed-scaling
started failing with 'invalid argument', where previously it would only
ever -ENODEV
I'm not 100% happy with the solution. It'd be better to handle
failure properly, but this is a low-impact change for 2.6.18
We can always revisit doing this better in .19 --davej.]
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Dave Jones <davej@redhat.com>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c b/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c index efb41e81351c..e6ea00edcb54 100644 --- a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c +++ b/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c | |||
@@ -567,16 +567,11 @@ static struct cpufreq_driver acpi_cpufreq_driver = { | |||
567 | static int __init | 567 | static int __init |
568 | acpi_cpufreq_init (void) | 568 | acpi_cpufreq_init (void) |
569 | { | 569 | { |
570 | int result = 0; | ||
571 | |||
572 | dprintk("acpi_cpufreq_init\n"); | 570 | dprintk("acpi_cpufreq_init\n"); |
573 | 571 | ||
574 | result = acpi_cpufreq_early_init_acpi(); | 572 | acpi_cpufreq_early_init_acpi(); |
575 | 573 | ||
576 | if (!result) | 574 | return cpufreq_register_driver(&acpi_cpufreq_driver); |
577 | result = cpufreq_register_driver(&acpi_cpufreq_driver); | ||
578 | |||
579 | return (result); | ||
580 | } | 575 | } |
581 | 576 | ||
582 | 577 | ||