aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Lu <aaron.lu@intel.com>2015-03-13 01:52:50 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-03-17 21:06:49 -0400
commitfd9caef4e222a2c5e7ed63050780d215a6a263f3 (patch)
tree6c9991f52589a217f577c83f05e68d990498f51b
parent06e5801b8cb3fc057d88cb4dc03c0b64b2744cda (diff)
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 <lv.zheng@intel.com> Signed-off-by: Aaron Lu <aaron.lu@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--drivers/acpi/scan.c4
1 files 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)
1062 acpi_device_notify(NULL, ACPI_FIXED_HARDWARE_EVENT, device); 1062 acpi_device_notify(NULL, ACPI_FIXED_HARDWARE_EVENT, device);
1063} 1063}
1064 1064
1065static acpi_status acpi_device_fixed_event(void *data) 1065static u32 acpi_device_fixed_event(void *data)
1066{ 1066{
1067 acpi_os_execute(OSL_NOTIFY_HANDLER, acpi_device_notify_fixed, data); 1067 acpi_os_execute(OSL_NOTIFY_HANDLER, acpi_device_notify_fixed, data);
1068 return AE_OK; 1068 return ACPI_INTERRUPT_HANDLED;
1069} 1069}
1070 1070
1071static int acpi_device_install_notify_handler(struct acpi_device *device) 1071static int acpi_device_install_notify_handler(struct acpi_device *device)