X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;ds=sidebyside;f=drivers%2Facpi%2Fscan.c;h=c88be6c37c309b79b147ea683b9e177b1b8cca33;hb=ca5c8a4c2aba577b4cd2f4c3c72a768a80830294;hp=53502d1bbf26f1bc9b5ac46d7db7ec11caa792a7;hpb=18dd0bf22b6f0c1bd5e4e813a42245ed86ec57b6;p=~andy%2Flinux

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 53502d1bbf2..c88be6c37c3 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1346,7 +1346,7 @@ static void acpi_device_set_id(struct acpi_device *device)
 			acpi_add_id(device, ACPI_DOCK_HID);
 		else if (!acpi_ibm_smbus_match(device))
 			acpi_add_id(device, ACPI_SMBUS_IBM_HID);
-		else if (!acpi_device_hid(device) &&
+		else if (list_empty(&device->pnp.ids) &&
 			 ACPI_IS_ROOT_DEVICE(device->parent)) {
 			acpi_add_id(device, ACPI_BUS_HID); /* \_SB, LNXSYBUS */
 			strcpy(device->pnp.device_name, ACPI_BUS_DEVICE_NAME);