sugar/linux
1
0
Fork 0
Code Activity

ACPI: fix boot with acpi=off

Browse Source 
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>
This commit is contained in:
Pavel Machek
2006-08-14 22:37:22 -07:00
committed by Len Brown
parent 0ee6a17389
commit 4d8316d5ea
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/acpi/ac.c
View File

@@ -285,6 +285,8 @@ static int __init acpi_ac_init(void)
{ {
int result; int result;
if (acpi_disabled)
return -ENODEV;
acpi_ac_dir = acpi_lock_ac_dir(); acpi_ac_dir = acpi_lock_ac_dir();
if (!acpi_ac_dir) if (!acpi_ac_dir)

3
drivers/acpi/battery.c
View File

@@ -757,6 +757,9 @@ static int __init acpi_battery_init(void)
{ {
int result; int result;
if (acpi_disabled)
return -ENODEV;
acpi_battery_dir = acpi_lock_battery_dir(); acpi_battery_dir = acpi_lock_battery_dir();
if (!acpi_battery_dir) if (!acpi_battery_dir)
return -ENODEV; return -ENODEV;