Browse files

PNPACPI: Fix device ref leaking in acpi_pnp_match

commit 89e96ad upstream.

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 <>
Signed-off-by: Len Brown <>
Signed-off-by: Greg Kroah-Hartman <>
  • Loading branch information...
1 parent 35cb6ba commit 5c9a4a9ae67f4f593664aabbedf006d445d2cbc3 Yinghai Lu committed with gregkh Mar 3, 2012
Showing with 6 additions and 1 deletion.
  1. +6 −1 drivers/pnp/pnpacpi/core.c
@@ -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));

0 comments on commit 5c9a4a9

Please sign in to comment.