diff options
| author | Pavel Machek <pavel@ucw.cz> | 2006-08-15 01:37:22 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-08-15 23:16:43 -0400 |
| commit | 4d8316d5ea4dcf0bf15d8a06d539ed7c99e9cfbe (patch) | |
| tree | 41fb896080563444bfdf047d56946d775b4f74a6 /drivers/acpi/ac.c | |
| parent | 0ee6a17389ceef65f1a86c38872fa98f08489022 (diff) | |
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/ac.c')
| -rw-r--r-- | drivers/acpi/ac.c | 2 |
1 files changed, 2 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) | |||
| 285 | { | 285 | { |
| 286 | int result; | 286 | int result; |
| 287 | 287 | ||
| 288 | if (acpi_disabled) | ||
| 289 | return -ENODEV; | ||
| 288 | 290 | ||
| 289 | acpi_ac_dir = acpi_lock_ac_dir(); | 291 | acpi_ac_dir = acpi_lock_ac_dir(); |
| 290 | if (!acpi_ac_dir) | 292 | if (!acpi_ac_dir) |