From: Len Brown <len.brown@intel.com>
To: linux-acpi@vger.kernel.org
Cc: Richard Hughes <richard@hughsie.com>, Len Brown <len.brown@intel.com>
Subject: [PATCH 06/12] ACPI: button: re-scan lid state on resume
Date: Fri, 3 Aug 2007 18:33:39 -0400 [thread overview]
Message-ID: <11861804313089-git-send-email-len.brown@intel.com> (raw)
Message-ID: <6c77088daa419b0bba83b0ce162e2f25a1a5e131.1186180370.git.len.brown@intel.com> (raw)
In-Reply-To: <11861804251625-git-send-email-len.brown@intel.com>
In-Reply-To: <67effe8fff32f60bdf51cba484766ba6003005bb.1186180370.git.len.brown@intel.com>
From: Richard Hughes <richard@hughsie.com>
On resume we need to refresh the lid status as we will not get an event if
the lid opening was what triggered the suspend.
This manifests itself in users never getting a "lid open" event when a
suspend happens because of lid close on hardware that supports wake on
lid open. This makes userspace gets very confused indeed.
Signed-off-by: Richard Hughes <richard@hughsie.com>
Signed-off-by: Len Brown <len.brown@intel.com>
---
drivers/acpi/button.c | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
index 5405813..b3c88aa 100644
--- a/drivers/acpi/button.c
+++ b/drivers/acpi/button.c
@@ -78,6 +78,7 @@ MODULE_DEVICE_TABLE(acpi, button_device_ids);
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);
@@ -87,6 +88,7 @@ static struct acpi_driver acpi_button_driver = {
.ids = button_device_ids,
.ops = {
.add = acpi_button_add,
+ .resume = acpi_button_resume,
.remove = acpi_button_remove,
},
};
@@ -497,6 +499,29 @@ 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; if it matches to what input layer
+ * thinks then the event will not even reach userspace.
+ */
+ 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;
--
1.5.3.rc3.7.gd58e
next prev parent reply other threads:[~2007-08-03 22:33 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-03 22:33 ACPI patches for 2.6.23-rc2 Len Brown
2007-08-03 22:33 ` [PATCH 01/12] ACPI: add "acpi_no_auto_ssdt" bootparam Len Brown
2007-08-03 22:33 ` Len Brown
2007-08-03 22:33 ` [PATCH 02/12] sony-laptop: restore the last user requested brightness level on resume Len Brown
2007-08-03 22:33 ` Len Brown
2007-08-03 22:33 ` [PATCH 03/12] sony-laptop: sony_nc_ids[] can become static Len Brown
2007-08-03 22:33 ` Len Brown
2007-08-03 22:33 ` [PATCH 04/12] sonypi: fix ids member of struct acpi_driver Len Brown
2007-08-03 22:33 ` Len Brown
2007-08-03 22:33 ` [PATCH 05/12] ACPI: thinkpad-acpi: fix the module init failure path Len Brown
2007-08-03 22:33 ` Len Brown
2007-08-03 22:33 ` Len Brown [this message]
2007-08-03 22:33 ` [PATCH 06/12] ACPI: button: re-scan lid state on resume Len Brown
2007-08-05 15:11 ` Thomas Renninger
2007-08-03 22:33 ` [PATCH 07/12] asus_acpi: fix possible double free (found by Coverity) Len Brown
2007-08-03 22:33 ` Len Brown
2007-08-03 22:33 ` [PATCH 08/12] ACPI: EC: Remove noisy debug printk fron EC driver Len Brown
2007-08-03 22:33 ` Len Brown
2007-08-03 22:33 ` [PATCH 09/12] ACPI: Battery: Synchronize battery operations Len Brown
2007-08-03 22:33 ` Len Brown
2007-08-03 22:33 ` [PATCH 10/12] ACPI: EC: If ECDT is not found, look up EC in DSDT Len Brown
2007-08-03 22:33 ` Len Brown
2007-08-03 22:33 ` [PATCH 11/12] ACPI: EC: fix build warning Len Brown
2007-08-03 22:33 ` Len Brown
2007-08-03 22:33 ` [PATCH 12/12] ACPI: EC: Switch from boot_ec as soon as we find its desc in DSDT Len Brown
2007-08-03 22:33 ` Len Brown
2007-08-08 8:11 ` [PATCH 01/12] ACPI: add "acpi_no_auto_ssdt" bootparam Thomas Renninger
2007-08-08 16:38 ` Len Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=11861804313089-git-send-email-len.brown@intel.com \
--to=len.brown@intel.com \
--cc=linux-acpi@vger.kernel.org \
--cc=richard@hughsie.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.