diff options
| author | Pavel Machek <pavel@ucw.cz> | 2006-08-14 22:37:22 -0700 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-08-15 23:16:43 -0400 |
| commit | 4d8316d5ea4dcf0bf15d8a06d539ed7c99e9cfbe (patch) | |
| tree | 41fb896080563444bfdf047d56946d775b4f74a6 /drivers/acpi | |
| parent | 0ee6a17389ceef65f1a86c38872fa98f08489022 (diff) | |
| download | blackbird-op-linux-4d8316d5ea4dcf0bf15d8a06d539ed7c99e9cfbe.tar.gz blackbird-op-linux-4d8316d5ea4dcf0bf15d8a06d539ed7c99e9cfbe.zip | |
ACPI: fix boot with acpi=off
Fix acpi_ac/battery boot with acpi=off
Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/ac.c | 2 | ||||
| -rw-r--r-- | drivers/acpi/battery.c | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c index 96309b9660da..11abc7bf777e 100644 --- a/drivers/acpi/ac.c +++ b/drivers/acpi/ac.c @@ -285,6 +285,8 @@ static int __init acpi_ac_init(void) { int result; + if (acpi_disabled) + return -ENODEV; acpi_ac_dir = acpi_lock_ac_dir(); if (!acpi_ac_dir) diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index 6e5221707d97..9810e2a55d0a 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c @@ -757,6 +757,9 @@ static int __init acpi_battery_init(void) { int result; + if (acpi_disabled) + return -ENODEV; + acpi_battery_dir = acpi_lock_battery_dir(); if (!acpi_battery_dir) return -ENODEV; |
