From 981674b89d0617ccf24ee3dc5f13209ccdbce802 Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Fri, 4 Jan 2013 23:00:54 +0100 Subject: [PATCH] --- yaml --- r: 348343 b: refs/heads/master c: 4f5f64cf0cc916220aaa055992e31195470cfe37 h: refs/heads/master i: 348341: 64c9ae9e235778151b4743b0bca4f235266aa33a 348339: f7c3cc605088fe63e33a6b786c79a8e7b741dd95 348335: b2c6b579a97d273d091ad999a157e40d17c6107b v: v3 --- [refs] | 2 +- trunk/drivers/acpi/scan.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 5a22b59647d1..20e87e9b42d0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0271f4f1176d7205b2b73ef956b169db8f417932 +refs/heads/master: 4f5f64cf0cc916220aaa055992e31195470cfe37 diff --git a/trunk/drivers/acpi/scan.c b/trunk/drivers/acpi/scan.c index 53502d1bbf26..c88be6c37c30 100644 --- a/trunk/drivers/acpi/scan.c +++ b/trunk/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);