From fd9caef4e222a2c5e7ed63050780d215a6a263f3 Mon Sep 17 00:00:00 2001 From: Aaron Lu Date: Fri, 13 Mar 2015 13:52:50 +0800 Subject: [PATCH 1/1] ACPI / scan: fix fixed event handler return value The fixed event handler should return a value that is either 0 or 1 meanning if the event is handled or not, instead of an acpi_status to mean if the handler runs well or not. Suggested-by: Lv Zheng Signed-off-by: Aaron Lu Signed-off-by: Rafael J. Wysocki --- drivers/acpi/scan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index bbca7830e18a..3e5a2768c3b4 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -1062,10 +1062,10 @@ static void acpi_device_notify_fixed(void *data) acpi_device_notify(NULL, ACPI_FIXED_HARDWARE_EVENT, device); } -static acpi_status acpi_device_fixed_event(void *data) +static u32 acpi_device_fixed_event(void *data) { acpi_os_execute(OSL_NOTIFY_HANDLER, acpi_device_notify_fixed, data); - return AE_OK; + return ACPI_INTERRUPT_HANDLED; } static int acpi_device_install_notify_handler(struct acpi_device *device) -- 2.20.1