diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-31 19:42:10 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-31 19:42:10 -0400 |
| commit | 6f0928036bcbd8dd2ebee9201580da8bcc0a81af (patch) | |
| tree | 53da30ac3b13cfc97803a51b178a6d6dbdb8c76b | |
| parent | 7c909b09372d5b064651202bf236b63caddd1777 (diff) | |
| parent | b6328a07bd6b3d31b64f85864fe74f3b08c010ca (diff) | |
Merge tag 'pm+acpi-3.16-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
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()
| -rw-r--r-- | drivers/pnp/pnpacpi/core.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c index b81448b2c75d..a5c6cb773e5f 100644 --- a/drivers/pnp/pnpacpi/core.c +++ b/drivers/pnp/pnpacpi/core.c | |||
| @@ -319,8 +319,7 @@ static int __init acpi_pnp_match(struct device *dev, void *_pnp) | |||
| 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) |