Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (59 commits)
  ACPI / PM: Fix build problems for !CONFIG_ACPI related to NVS rework
  ACPI: fix resource check message
  ACPI / Battery: Update information on info notification and resume
  ACPI: Drop device flag wake_capable
  ACPI: Always check if _PRW is present before trying to evaluate it
  ACPI / PM: Check status of power resources under mutexes
  ACPI / PM: Rename acpi_power_off_device()
  ACPI / PM: Drop acpi_power_nocheck
  ACPI / PM: Drop acpi_bus_get_power()
  Platform / x86: Make fujitsu_laptop use acpi_bus_update_power()
  ACPI / Fan: Rework the handling of power resources
  ACPI / PM: Register power resource devices as soon as they are needed
  ACPI / PM: Register acpi_power_driver early
  ACPI / PM: Add function for updating device power state consistently
  ACPI / PM: Add function for device power state initialization
  ACPI / PM: Introduce __acpi_bus_get_power()
  ACPI / PM: Introduce function for refcounting device power resources
  ACPI / PM: Add functions for manipulating lists of power resources
  ACPI / PM: Prevent acpi_power_get_inferred_state() from making changes
  ACPICA: Update version to 20101209
  ...

1 files changed, 7 insertions, 2 deletions

diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
index 71ef9cd0735..76bbb78a5ad 100644
--- a/drivers/acpi/button.c
+++ b/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);
@@ -426,7 +431,7 @@ static int acpi_button_add(struct acpi_device *device)
                 acpi_enable_gpe(device->wakeup.gpe_device,
                                 device->wakeup.gpe_number);
                 device->wakeup.run_wake_count++;
-                device->wakeup.state.enabled = 1;
+                device_set_wakeup_enable(&device->dev, true);
         }
 
         printk(KERN_INFO PREFIX "%s [%s]\n", name, acpi_device_bid(device));
@@ -449,7 +454,7 @@ static int acpi_button_remove(struct acpi_device *device, int type)
                 acpi_disable_gpe(device->wakeup.gpe_device,
                                 device->wakeup.gpe_number);
                 device->wakeup.run_wake_count--;
-                device->wakeup.state.enabled = 0;
+                device_set_wakeup_enable(&device->dev, false);
         }
 
         acpi_button_remove_fs(device);