On Fri, 2007-06-15 at 13:29 +0100, Richard Hughes wrote: > in response to an event, but I'm thinking in a resume hook we should > probably do acpi_evaluate_integer(handle, "_LID", NULL, &state) and then > send an event, just so userspace is aware of what the state of the panel > is. Attached patch fixed the issue for me. Comments? Richard.
diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c index cb4110b..3631b8f 100644 --- a/drivers/acpi/button.c +++ b/drivers/acpi/button.c @@ -68,6 +68,7 @@ MODULE_LICENSE("GPL"); static int acpi_button_add(struct acpi_device *device); static int acpi_button_remove(struct acpi_device *device, int type); +static int acpi_button_resume(struct acpi_device *device); static int acpi_button_info_open_fs(struct inode *inode, struct file *file); static int acpi_button_state_open_fs(struct inode *inode, struct file *file); @@ -77,6 +78,7 @@ static struct acpi_driver acpi_button_driver = { .ids = "button_power,button_sleep,PNP0C0D,PNP0C0C,PNP0C0E", .ops = { .add = acpi_button_add, + .resume = acpi_button_resume, .remove = acpi_button_remove, }, }; @@ -487,6 +489,27 @@ static int acpi_button_remove(struct acpi_device *device, int type) return 0; } +/* this is needed to learn about changes made in suspended state */ +static int acpi_button_resume(struct acpi_device *device) +{ + struct acpi_button *button; + struct acpi_handle *handle; + struct input_dev *input; + unsigned long state; + + button = device->driver_data; + handle = button->device->handle; + input = button->input; + + /* on resume we send the state; it might be the same, but userspace + * should handle duplicated events */ + if (!ACPI_FAILURE(acpi_evaluate_integer(handle, "_LID", + NULL, &state))) + input_report_switch(input, SW_LID, !state); + + return 0; +} + static int __init acpi_button_init(void) { int result;