acer-wmi - Fail gracefully if ACPI is disabled From: Carlos Corbacho <carlos@xxxxxxxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxxxxxxx> CC: Ingo Molnar <mingo@xxxxxxx> CC: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> CC: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> CC: Len Brown <lenb@xxxxxxxxxx> --- drivers/misc/acer-wmi.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/drivers/misc/acer-wmi.c b/drivers/misc/acer-wmi.c index d7aea93..6e81027 100644 --- a/drivers/misc/acer-wmi.c +++ b/drivers/misc/acer-wmi.c @@ -1029,6 +1029,9 @@ static int __init acer_wmi_init(void) { int err; + if (acpi_disabled) + return -ENODEV; + printk(ACER_INFO "Acer Laptop ACPI-WMI Extras version %s\n", ACER_WMI_VERSION); - To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html