ACPI / PNP: Fix acpi_pnp_match()
The acpi_pnp_match() function is used for finding the ACPI device object that should be associated with the given PNP device. Unfortunately, the check used by that function is not strict enough and may cause success to be returned for a wrong ACPI device object. To fix that, use the observation that the pointer to the ACPI device object in question is already stored in the data field in struct pnp_dev, so acpi_pnp_match() can simply use that field to do its job. This problem was uncovered in 3.14 by commit202317a573
(ACPI / scan: Add acpi_device objects for all device nodes in the namespace). Fixes:202317a573
(ACPI / scan: Add acpi_device objects for all device nodes in the namespace) Reported-and-tested-by: Vinson Lee <vlee@twopensource.com> Cc: 3.14+ <stable@vger.kernel.org> # 3.14+ Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
parent
64aa90f26c
commit
b6328a07bd
|
@ -319,8 +319,7 @@ static int __init acpi_pnp_match(struct device *dev, void *_pnp)
|
||||||
struct pnp_dev *pnp = _pnp;
|
struct pnp_dev *pnp = _pnp;
|
||||||
|
|
||||||
/* true means it matched */
|
/* true means it matched */
|
||||||
return !acpi->physical_node_count
|
return pnp->data == acpi;
|
||||||
&& compare_pnp_id(pnp->id, acpi_device_hid(acpi));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct acpi_device * __init acpi_pnp_find_companion(struct device *dev)
|
static struct acpi_device * __init acpi_pnp_find_companion(struct device *dev)
|
||||||
|
|
Loading…
Reference in a new issue