Commit 89e96ada authored Mar 03, 2012 by Yinghai Lu Committed by Len Brown Mar 30, 2012

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: Yinghai Lu <yinghai@kernel.org>
Cc: stable@vger.kernel.org
Signed-off-by: Len Brown <len.brown@intel.com>

parent ac909ec3

drivers/pnp/pnpacpi/core.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -321,9 +321,14 @@ static int __init acpi_pnp_match(struct device dev, void _pnp)
		{
		struct acpi_device *acpi = to_acpi_device(dev);
		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 */
		return !acpi_get_physical_device(acpi->handle)
		return !physical_device
		&& compare_pnp_id(pnp->id, acpi_device_hid(acpi));
		}