Merge branch 'wakeup-etc-rafael' into release

1 files changed, 1 insertions, 4 deletions

diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index 78b0164c35b2..7c47ed55e528 100644
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
@@ -167,11 +167,8 @@ static int acpi_bind_one(struct device *dev, acpi_handle handle)
                                 "firmware_node");
                 ret = sysfs_create_link(&acpi_dev->dev.kobj, &dev->kobj,
                                 "physical_node");
-                if (acpi_dev->wakeup.flags.valid) {
+                if (acpi_dev->wakeup.flags.valid)
                         device_set_wakeup_capable(dev, true);
-                        device_set_wakeup_enable(dev,
-                                                acpi_dev->wakeup.state.enabled);
-                }
         }
 
         return 0;