From 95e6496679b9c2e8ab25356a0691d345a4a496ff Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Thu, 6 Jan 2011 23:36:01 +0100 Subject: [PATCH] --- yaml --- r: 230908 b: refs/heads/master c: 1f83511bd8f44b8a9e2d82263b2c95f26a625fcc h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/acpi/button.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index e87609ed93b1..984bbc5be89b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7fa69baf29de8c77a6b32c054df2abb8f11f8aa4 +refs/heads/master: 1f83511bd8f44b8a9e2d82263b2c95f26a625fcc diff --git a/trunk/drivers/acpi/button.c b/trunk/drivers/acpi/button.c index 234c104fcdd8..76bbb78a5ad9 100644 --- a/trunk/drivers/acpi/button.c +++ b/trunk/drivers/acpi/button.c @@ -279,6 +279,9 @@ static int acpi_lid_send_state(struct acpi_device *device) input_report_switch(button->input, SW_LID, !state); input_sync(button->input); + if (state) + pm_wakeup_event(&device->dev, 0); + ret = blocking_notifier_call_chain(&acpi_lid_notifier, state, device); if (ret == NOTIFY_DONE) ret = blocking_notifier_call_chain(&acpi_lid_notifier, state, @@ -314,6 +317,8 @@ static void acpi_button_notify(struct acpi_device *device, u32 event) input_sync(input); input_report_key(input, keycode, 0); input_sync(input); + + pm_wakeup_event(&device->dev, 0); } acpi_bus_generate_proc_event(device, event, ++button->pushed);