From 603854ae5ef5300b33fd80fcedb43d377a7196eb Mon Sep 17 00:00:00 2001
From: Tang Chen <tangchen@cn.fujitsu.com>
Date: Fri, 26 Oct 2012 13:38:16 +0200
Subject: [PATCH] --- yaml --- r: 336670 b: refs/heads/master c:
 594df89a59cf2a2afc22fe27f508dd864d1edb5f h: refs/heads/master v: v3

---
 [refs]                         |  2 +-
 trunk/drivers/acpi/container.c | 17 ++++++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 2d5864f34380..a3bddbf8016a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a290ac4252c85205cb924ff7f6da10cfd20fb01
+refs/heads/master: 594df89a59cf2a2afc22fe27f508dd864d1edb5f
diff --git a/trunk/drivers/acpi/container.c b/trunk/drivers/acpi/container.c
index 1f9f7d7d7bc5..69e2d6be910c 100644
--- a/trunk/drivers/acpi/container.c
+++ b/trunk/drivers/acpi/container.c
@@ -92,6 +92,19 @@ static int is_device_present(acpi_handle handle)
 	return ((sta & ACPI_STA_DEVICE_PRESENT) == ACPI_STA_DEVICE_PRESENT);
 }
 
+static bool is_container_device(const char *hid)
+{
+	const struct acpi_device_id *container_id;
+
+	for (container_id = container_device_ids;
+	     container_id->id[0]; container_id++) {
+		if (!strcmp((char *)container_id->id, hid))
+			return true;
+	}
+
+	return false;
+}
+
 /*******************************************************************/
 static int acpi_container_add(struct acpi_device *device)
 {
@@ -232,10 +245,8 @@ container_walk_namespace_cb(acpi_handle handle,
 		goto end;
 	}
 
-	if (strcmp(hid, "ACPI0004") && strcmp(hid, "PNP0A05") &&
-	    strcmp(hid, "PNP0A06")) {
+	if (!is_container_device(hid))
 		goto end;
-	}
 
 	switch (*action) {
 	case INSTALL_NOTIFY_HANDLER: