From cb122f6bcdce136a224269608ef97d35c3b1b8f4 Mon Sep 17 00:00:00 2001
From: Lin Ming <ming.m.lin@intel.com>
Date: Tue, 16 Dec 2008 16:46:12 +0800
Subject: [PATCH] --- yaml --- r: 128038 b: refs/heads/master c:
 0175d562a29ad052c510782c7e76bc63d5155b9b h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/acpi/ec.c | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ebb51c0df43c..cc4e06f4e5a3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 889c78be9e8d84ea7f991b9b868e006cdb8e42b0
+refs/heads/master: 0175d562a29ad052c510782c7e76bc63d5155b9b
diff --git a/trunk/drivers/acpi/ec.c b/trunk/drivers/acpi/ec.c
index 30f3ef236ecb..2cbc2c9c07ac 100644
--- a/trunk/drivers/acpi/ec.c
+++ b/trunk/drivers/acpi/ec.c
@@ -756,10 +756,15 @@ static acpi_status
 acpi_ec_register_query_methods(acpi_handle handle, u32 level,
 			       void *context, void **return_value)
 {
-	struct acpi_namespace_node *node = handle;
+	char node_name[5];
+	struct acpi_buffer buffer = { sizeof(node_name), node_name };
 	struct acpi_ec *ec = context;
 	int value = 0;
-	if (sscanf(node->name.ascii, "_Q%x", &value) == 1) {
+	acpi_status status;
+
+	status = acpi_get_name(handle, ACPI_SINGLE_NAME, &buffer);
+
+	if (ACPI_SUCCESS(status) && sscanf(node_name, "_Q%x", &value) == 1) {
 		acpi_ec_add_query_handler(ec, value, handle, NULL, NULL);
 	}
 	return AE_OK;