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;