Skip to content

Commit

Permalink
PNPACPI: Fix device ref leaking in acpi_pnp_match
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Yinghai Lu authored and Len Brown committed Mar 30, 2012
1 parent ac909ec commit 89e96ad
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion drivers/pnp/pnpacpi/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}

Expand Down

0 comments on commit 89e96ad

Please sign in to comment.