summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-04-07 13:48:26 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-04-07 13:48:26 +0200
commitdc752d54fd3a69c882d24133810edeb22dda2d0d (patch)
tree9476da046155745ec7c039f0635eb1f892585694 /drivers
parenta71c9a1c779f2499fb2afc0553e543f18aff6edf (diff)
parentfdad4e7a876a2cb3d2c1f04e5418c324e79fffef (diff)
downloadlinux-dc752d54fd3a69c882d24133810edeb22dda2d0d.tar.bz2
Merge branch 'acpi-scan-fixes'
* acpi-scan-fixes: ACPI / scan: Prefer devices without _HID for _ADR matching
Diffstat (limited to 'drivers')
-rw-r--r--drivers/acpi/glue.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index fb19e1cdb641..edc8663b5db3 100644
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
@@ -99,13 +99,13 @@ static int find_child_checks(struct acpi_device *adev, bool check_children)
return -ENODEV;
/*
- * If the device has a _HID (or _CID) returning a valid ACPI/PNP
- * device ID, it is better to make it look less attractive here, so that
- * the other device with the same _ADR value (that may not have a valid
- * device ID) can be matched going forward. [This means a second spec
- * violation in a row, so whatever we do here is best effort anyway.]
+ * If the device has a _HID returning a valid ACPI/PNP device ID, it is
+ * better to make it look less attractive here, so that the other device
+ * with the same _ADR value (that may not have a valid device ID) can be
+ * matched going forward. [This means a second spec violation in a row,
+ * so whatever we do here is best effort anyway.]
*/
- return sta_present && list_empty(&adev->pnp.ids) ?
+ return sta_present && !adev->pnp.type.platform_id ?
FIND_CHILD_MAX_SCORE : FIND_CHILD_MIN_SCORE;
}