ACPI: button: Call device_init_wakeup() earlier during probe

Calling device_init_wakeup() after installing a notify handler in which
wakeup events are signaled may cause a wakeup event to be missed if the
device is probed right before a system suspend.

To avoid this, move the device_init_wakeup() call in acpi_button_probe()
before the notify handler installation and add a corresponding cleanup
to the error path.

Also carry out wakeup cleanup for the button in acpi_button_remove()
because after that point the notify handler will not run for it and
wakeup events coming from it will not be signaled.

Fixes: 0d51157dfaac ("ACPI: button: Eliminate the driver notify callback")
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://patch.msgid.link/12854922.O9o76ZdvQC@rafael.j.wysocki

diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
index b899b8745feddb8f88eaaec9437b4cefd8eb7f09..38bc64d6bdaf36c738a37c26dac84e5f6a85f416 100644 (file)
--- a/drivers/acpi/button.c
+++ b/drivers/acpi/button.c
@@ -625,6 +625,8 @@ static int acpi_button_probe(struct platform_device *pdev)
                goto err_remove_fs;
        }
 
+       device_init_wakeup(&pdev->dev, true);
+
        switch (device->device_type) {
        case ACPI_BUS_TYPE_POWER_BUTTON:
                status = acpi_install_fixed_event_handler(ACPI_EVENT_POWER_BUTTON,
@@ -655,11 +657,11 @@ static int acpi_button_probe(struct platform_device *pdev)
                lid_device = device;
        }
 
-       device_init_wakeup(&pdev->dev, true);
        pr_info("%s [%s]\n", name, acpi_device_bid(device));
        return 0;
 
 err_input_unregister:
+       device_init_wakeup(&pdev->dev, false);
        input_unregister_device(input);
 err_remove_fs:
        acpi_button_remove_fs(button);
@@ -691,6 +693,8 @@ static void acpi_button_remove(struct platform_device *pdev)
        }
        acpi_os_wait_events_complete();
 
+       device_init_wakeup(&pdev->dev, false);
+
        acpi_button_remove_fs(button);
        input_unregister_device(button->input);
        kfree(button);