diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-01-10 13:26:35 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-01-11 18:54:50 +0100 |
| commit | 19351f340765ebef48d07eade8ffb5f6f1118244 (patch) | |
| tree | 99294de970cc104c6435e6f8065bbc239f123f40 /drivers/platform/x86/surfacepro3_button.c | |
| parent | ACPI / PM: Use Low Power S0 Idle on more systems (diff) | |
| download | linux-dev-19351f340765ebef48d07eade8ffb5f6f1118244.tar.xz linux-dev-19351f340765ebef48d07eade8ffb5f6f1118244.zip | |
platform/x86: surfacepro3: Support for wakeup from suspend-to-idle
Modify surface_button_notify() to make it wake up the system from
suspend-to-idle (by reporting "hard" wakeup events while suspended)
and add wakeup initialization to surface_button_add() for wakeup
events reported by this driver to work at all.
Link: https://bugzilla.kernel.org/show_bug.cgi?id=198389
Reported-by: Valentin Manea <valy@mrs.ro>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Tested-by: Valentin Manea <valy@mrs.ro>
Diffstat (limited to 'drivers/platform/x86/surfacepro3_button.c')
| -rw-r--r-- | drivers/platform/x86/surfacepro3_button.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/platform/x86/surfacepro3_button.c b/drivers/platform/x86/surfacepro3_button.c index 6505c97705e1..1b491690ce07 100644 --- a/drivers/platform/x86/surfacepro3_button.c +++ b/drivers/platform/x86/surfacepro3_button.c @@ -119,7 +119,7 @@ static void surface_button_notify(struct acpi_device *device, u32 event) if (key_code == KEY_RESERVED) return; if (pressed) - pm_wakeup_event(&device->dev, 0); + pm_wakeup_dev_event(&device->dev, 0, button->suspended); if (button->suspended) return; input_report_key(input, key_code, pressed?1:0); @@ -185,6 +185,8 @@ static int surface_button_add(struct acpi_device *device) error = input_register_device(input); if (error) goto err_free_input; + + device_init_wakeup(&device->dev, true); dev_info(&device->dev, "%s [%s]\n", name, acpi_device_bid(device)); return 0; |