diff options
| author | Yinghai Lu <yinghai@kernel.org> | 2012-03-03 13:29:20 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-13 08:14:05 -0700 |
| commit | f622c87aa350b3be25c98937dc4ae850aee5dee8 (patch) | |
| tree | 721513c1d4e162d162e8d8334c2410ad805bf4df /drivers/pnp | |
| parent | d70e0fd149e70e664b1f9673a710799e1f432606 (diff) | |
| download | kernel_samsung_smdk4412-f622c87aa350b3be25c98937dc4ae850aee5dee8.zip kernel_samsung_smdk4412-f622c87aa350b3be25c98937dc4ae850aee5dee8.tar.gz kernel_samsung_smdk4412-f622c87aa350b3be25c98937dc4ae850aee5dee8.tar.bz2 | |
PNPACPI: Fix device ref leaking in acpi_pnp_match
commit 89e96ada572fb216e582dbe3f64e1a6939a37f74 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 <yinghai@kernel.org>
Signed-off-by: Len Brown <len.brown@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/pnp')
| -rw-r--r-- | drivers/pnp/pnpacpi/core.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c index ca84d50..5f44b55 100644 --- a/drivers/pnp/pnpacpi/core.c +++ b/drivers/pnp/pnpacpi/core.c @@ -320,9 +320,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)); } |