| Message ID | 6492549.QWquAG8VGe@aspire.rjw.lan (mailing list archive) |
|---|---|
| State | Mainlined |
| Delegated to: | Rafael Wysocki |
| Headers | show |
On Wed, 2018-01-10 at 13:26 +0100, Rafael J. Wysocki wrote: > From: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > > 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> Change seems sane to me. Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> (in case you would like to push it through PM tree, otherwise I can take it) > --- > drivers/platform/x86/surfacepro3_button.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > Index: linux-pm/drivers/platform/x86/surfacepro3_button.c > =================================================================== > --- linux-pm.orig/drivers/platform/x86/surfacepro3_button.c > +++ linux-pm/drivers/platform/x86/surfacepro3_button.c > @@ -119,7 +119,7 @@ static void surface_button_notify(struct > 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 acp > 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; >
Index: linux-pm/drivers/platform/x86/surfacepro3_button.c =================================================================== --- linux-pm.orig/drivers/platform/x86/surfacepro3_button.c +++ linux-pm/drivers/platform/x86/surfacepro3_button.c @@ -119,7 +119,7 @@ static void surface_button_notify(struct 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 acp 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;