fix boot with acpi=off

PATCH New Pavel Machek 1 participant 1 message Jul 8, 2006 ACPI

lore

Share & tools

lore

Pavel Machek

author

2006-07-08 12:43 UTC #0 lore raw

PATCH 1/1 fix boot with acpi=off

With acpi=off and acpi_ac/battery compiled into kernel, acpi breaks boot. This fixes it.

Signed-off-by Pavel Machek <[email protected]>

---
commit 30b8ecda788b096fbd7088808f9af65c41c3a83d tree 3c28088018932f9ceb18bcf980507474d4a50c4e parent 05f70501240c6ad5f852f13c187ee55579ad7bb8 author <[email protected]> Sat, 08 Jul 2006 14:43:13 +0200 committer <[email protected]> Sat, 08 Jul 2006 14:43:13 +0200

 drivers/acpi/ac.c      |    2 ++
 drivers/acpi/battery.c |    3 +++
 2 files changed, 5 insertions(+), 0 deletions(-)

drivers/acpi/ac.c +2 -0

index 24ccf81..432b6b7 100644
@@ -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)

drivers/acpi/battery.c +3 -0

index 2ce9b35..5af1f64 100644
@@ -764,6 +764,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;

Signature · 2 lines

(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html