Pull ACPI fix from Rafael Wysocki: "One commit that fixes a problem causing PNP devices to be associated with wrong ACPI device objects sometimes during device enumeration due to an incorrect check in a matching function. That problem was uncovered by the ACPI device enumeration rework in 3.14" * tag 'pm+acpi-3.16-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: ACPI / PNP: Fix acpi_pnp_match()
Unified · Split
| @@ -319,8 +319,7 @@ static int __init acpi_pnp_match(struct device *dev, void *_pnp) · 318 unmodified lines | |||
| 319 | struct pnp_dev *pnp = _pnp; | 319 | struct pnp_dev *pnp = _pnp; |
| 320 | 320 | ||
| 321 | /* true means it matched */ | 321 | /* true means it matched */ |
| 322 | return !acpi->physical_node_count | 322 | return pnp->data == acpi; |
| 323 | && compare_pnp_id(pnp->id, acpi_device_hid(acpi)); | ||
| 324 | } | 323 | } |
| 325 | 324 | ||
| 326 | static struct acpi_device * __init acpi_pnp_find_companion(struct device *dev) | 325 | static struct acpi_device * __init acpi_pnp_find_companion(struct device *dev) |