Commit 89e96ada authored by Yinghai Lu's avatar Yinghai Lu Committed by Len Brown

PNPACPI: Fix device ref leaking in acpi_pnp_match

During testing pci root bus removal, found some root bus bridge is not freed.
If booting with pnpacpi=off, those hostbridge could be freed without problem.
It turns out that some devices reference are not released during acpi_pnp_match.
that match should not hold one device ref during every calling.
Add pu_device calling before returning.
Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent ac909ec3
...@@ -321,9 +321,14 @@ static int __init acpi_pnp_match(struct device *dev, void *_pnp) ...@@ -321,9 +321,14 @@ static int __init acpi_pnp_match(struct device *dev, void *_pnp)
{ {
struct acpi_device *acpi = to_acpi_device(dev); struct acpi_device *acpi = to_acpi_device(dev);
struct pnp_dev *pnp = _pnp; struct pnp_dev *pnp = _pnp;
struct device *physical_device;
physical_device = acpi_get_physical_device(acpi->handle);
if (physical_device)
put_device(physical_device);
/* true means it matched */ /* true means it matched */
return !acpi_get_physical_device(acpi->handle) return !physical_device
&& compare_pnp_id(pnp->id, acpi_device_hid(acpi)); && compare_pnp_id(pnp->id, acpi_device_hid(acpi));
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment