diff options
Diffstat (limited to 'drivers/acpi/scan.c')
-rw-r--r-- | drivers/acpi/scan.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index ae44d8654c82..d670158a26c5 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c | |||
@@ -1470,7 +1470,7 @@ static void acpi_wakeup_gpe_init(struct acpi_device *device) | |||
1470 | if (ACPI_FAILURE(status)) | 1470 | if (ACPI_FAILURE(status)) |
1471 | return; | 1471 | return; |
1472 | 1472 | ||
1473 | wakeup->flags.run_wake = !!(event_status & ACPI_EVENT_FLAG_HANDLE); | 1473 | wakeup->flags.run_wake = !!(event_status & ACPI_EVENT_FLAG_HAS_HANDLER); |
1474 | } | 1474 | } |
1475 | 1475 | ||
1476 | static void acpi_bus_get_wakeup_device_flags(struct acpi_device *device) | 1476 | static void acpi_bus_get_wakeup_device_flags(struct acpi_device *device) |
@@ -2315,6 +2315,7 @@ int __init acpi_scan_init(void) | |||
2315 | acpi_container_init(); | 2315 | acpi_container_init(); |
2316 | acpi_memory_hotplug_init(); | 2316 | acpi_memory_hotplug_init(); |
2317 | acpi_pnp_init(); | 2317 | acpi_pnp_init(); |
2318 | acpi_int340x_thermal_init(); | ||
2318 | 2319 | ||
2319 | mutex_lock(&acpi_scan_lock); | 2320 | mutex_lock(&acpi_scan_lock); |
2320 | /* | 2321 | /* |