Merge branches 'acpi-button', 'acpica' and 'acpi-sysfs'

[sfrench/cifs-2.6.git] / drivers / acpi / button.c

diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
index e19f530f1083a13732328516925e3bbeb6493e14..9ad8cdb58743b765a6daa615729d78745d70af30 100644 (file)
--- a/drivers/acpi/button.c
+++ b/drivers/acpi/button.c
@@ -217,7 +217,7 @@ static int acpi_lid_notify_state(struct acpi_device *device, int state)
        }
 
        if (state)
        }
 
        if (state)

-               pm_wakeup_event(&device->dev, 0);
+               pm_wakeup_hard_event(&device->dev);

 
        ret = blocking_notifier_call_chain(&acpi_lid_notifier, state, device);
        if (ret == NOTIFY_DONE)
 
        ret = blocking_notifier_call_chain(&acpi_lid_notifier, state, device);
        if (ret == NOTIFY_DONE)


@@ -402,7 +402,7 @@ static void acpi_button_notify(struct acpi_device *device, u32 event)
                } else {
                        int keycode;
 
                } else {
                        int keycode;
 

-                       pm_wakeup_event(&device->dev, 0);
+                       pm_wakeup_hard_event(&device->dev);

                        if (button->suspended)
                                break;
 
                        if (button->suspended)
                                break;
 


@@ -534,6 +534,7 @@ static int acpi_button_add(struct acpi_device *device)
                lid_device = device;
        }
 
                lid_device = device;
        }
 

+       device_init_wakeup(&device->dev, true);

        printk(KERN_INFO PREFIX "%s [%s]\n", name, acpi_device_bid(device));
        return 0;
 
        printk(KERN_INFO PREFIX "%s [%s]\n", name, acpi_device_bid(device));
        return 0;