6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Rafael J. Wysocki [ Upstream commit 91ba8de81bcb8cea922ee9427e54798a16dfd724 ] It is generally questionable to mark struct acpi_device "devices" as wakeup-capable because they represent firmware entities that by themselves have no wakeup capabilities. It was done for struct acpi_device "devices" corresponding to buttons because the ACPI button driver was binding to them directly, but now that corresponding platform devices are created for the buttons and they are marked as wakeup-capable by the ACPI button driver, there is no reason to continue doing it. Update acpi_wakeup_gpe_init() accordingly. Signed-off-by: Rafael J. Wysocki Link: https://patch.msgid.link/2891119.BEx9A2HvPv@rafael.j.wysocki Stable-dep-of: 57c31e6d620f ("ACPI: scan: Use acpi_setup_gpe_for_wake() for buttons") Signed-off-by: Sasha Levin --- drivers/acpi/scan.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 32fa1c1ded601..31cd177bd9672 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -1029,7 +1029,6 @@ static bool acpi_wakeup_gpe_init(struct acpi_device *device) wakeup->sleep_state == ACPI_STATE_S5) wakeup->sleep_state = ACPI_STATE_S4; acpi_mark_gpe_for_wake(wakeup->gpe_device, wakeup->gpe_number); - device_set_wakeup_capable(&device->dev, true); return true; } -- 2.53.0