[PATCH 2/2] tc1100-wmi - Fail gracefully if ACPI is disabled

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: Ingo Molnar <mingo@...>
Cc: Len Brown <lenb@...>, Linus Torvalds <torvalds@...>, Andrew Morton <akpm@...>, <linux-acpi@...>, <linux-kernel@...>, <linux-pm@...>
Date: Monday, February 11, 2008 - 3:55 pm

tc1100-wmi - Fail gracefully if ACPI is disabled

From: Carlos Corbacho <carlos@strangeworlds.co.uk>

WMI drivers, like their ACPI counterparts, should also check if ACPI is
disabled or not, and bail out if so, otherwise we cause a crash.

Spotted by Ingo Molnar.

Signed-off-by: Carlos Corbacho <carlos@strangeworlds.co.uk>
CC: Ingo Molnar <mingo@elte.hu>
CC: Linus Torvalds <torvalds@linux-foundation.org>
CC: Andrew Morton <akpm@linux-foundation.org>
CC: Len Brown <lenb@kernel.org>
---

 drivers/misc/tc1100-wmi.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)


diff --git a/drivers/misc/tc1100-wmi.c b/drivers/misc/tc1100-wmi.c
index f25e4c9..cb8f79f 100644
--- a/drivers/misc/tc1100-wmi.c
+++ b/drivers/misc/tc1100-wmi.c
@@ -263,6 +263,9 @@ static int __init tc1100_init(void)
 {
 	int result = 0;
 
+	if (acpi_disabled)
+		return -ENODEV;
+
 	if (!wmi_has_guid(GUID))
 		return -ENODEV;
 
--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[GIT PATCH] ACPI patches for 2.6.25-rc0 (#2), Len Brown, (Fri Feb 8, 2:45 am)
Re: [GIT PATCH] ACPI patches for 2.6.25-rc0 (#2), Ingo Molnar, (Sat Feb 9, 2:17 am)
Re: [GIT PATCH] ACPI patches for 2.6.25-rc0 (#2), Ingo Molnar, (Sat Feb 9, 2:19 am)
Re: [GIT PATCH] ACPI patches for 2.6.25-rc0 (#2), Carlos Corbacho, (Sat Feb 9, 7:42 am)
Re: [GIT PATCH] ACPI patches for 2.6.25-rc0 (#2), Ingo Molnar, (Mon Feb 11, 5:17 am)
Re: [GIT PATCH] ACPI patches for 2.6.25-rc0 (#2), Carlos Corbacho, (Mon Feb 11, 3:23 pm)
[PATCH 2/2] tc1100-wmi - Fail gracefully if ACPI is disabled, Carlos Corbacho, (Mon Feb 11, 3:55 pm)
[PATCH 1/2] acer-wmi - Fail gracefully if ACPI is disabled, Carlos Corbacho, (Mon Feb 11, 3:55 pm)