If acpi disabled via kernel parameter, then resource checks should report no conflicts instead of reporting error. kernel log error sample: ACPI Exception: AE_BAD_PARAMETER, Thread 920463680 could not acquire Mutex [0x1] (20120320/utmutex-276) Signed-off-by: Tony Zelenoff <antonz@xxxxxxxxxxxxx> --- drivers/acpi/osl.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index c3881b2..a05baa1 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -1360,6 +1360,8 @@ int acpi_check_resource_conflict(const struct resource *res) u8 warn = 0; int clash = 0; + if (acpi_disabled) + return 0; if (acpi_enforce_resources == ENFORCE_RESOURCES_NO) return 0; if (!(res->flags & IORESOURCE_IO) && !(res->flags & IORESOURCE_MEM)) -- 1.7.1 -- 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
