From 33f4954ec537be4dd64e5c20bb51b6397b1f4423 Mon Sep 17 00:00:00 2001
From: Bjorn Helgaas <bjorn.helgaas@hp.com>
Date: Mon, 21 Sep 2009 13:35:14 -0600
Subject: [PATCH] --- yaml --- r: 166391 b: refs/heads/master c:
 b1fbfb2ae8f2f0e04219218da6f52f7313466899 h: refs/heads/master i:   166389:
 5388cef62968afa9a38bedfb834546c06cfb4033   166387:
 5af43ee7bcc1db890d31c1dcebed209092ca4440   166383:
 d6cffc81923a32d07d9deffa15229f06ff5b02dd v: v3

---
 [refs]                    |  2 +-
 trunk/drivers/acpi/scan.c | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a17d8cde0f07..c2f7e37cb7c7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ea8d82fd316208bd0ffe6f64823d04bcb8c57158
+refs/heads/master: b1fbfb2ae8f2f0e04219218da6f52f7313466899
diff --git a/trunk/drivers/acpi/scan.c b/trunk/drivers/acpi/scan.c
index 269c0aae4bed..53b96e7a64ab 100644
--- a/trunk/drivers/acpi/scan.c
+++ b/trunk/drivers/acpi/scan.c
@@ -1155,6 +1155,16 @@ static void acpi_device_set_id(struct acpi_device *device)
 		break;
 	}
 
+	/*
+	 * We build acpi_devices for some objects that don't have _HID or _CID,
+	 * e.g., PCI bridges and slots.  Drivers can't bind to these objects,
+	 * but we do use them indirectly by traversing the acpi_device tree.
+	 * This generic ID isn't useful for driver binding, but it provides
+	 * the useful property that "every acpi_device has an ID."
+	 */
+	if (!hid && !cid_list && !cid_add)
+		hid = "device";
+
 	if (hid) {
 		device->pnp.hardware_id = ACPI_ALLOCATE_ZEROED(strlen (hid) + 1);
 		if (device->pnp.hardware_id) {