diff options
| author | Yijing Wang <wangyijing@huawei.com> | 2013-06-06 09:34:51 +0200 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2013-06-18 18:47:33 +0200 |
| commit | 2932239fb485931b82c50e4876a0c2d14b7711ac (patch) | |
| tree | 0b43e9980e199829b3043f0653de2552a0bd33d5 | |
| parent | PCI/IA64: fix memleak for create pci root bus fail (diff) | |
| download | linux-2932239fb485931b82c50e4876a0c2d14b7711ac.tar.xz linux-2932239fb485931b82c50e4876a0c2d14b7711ac.zip | |
PCI/IA64: Add host bridge resource release for _CRS path
Set IA64 host bridge release function to make sure root bridge
related resources get freed during root bus removal.
Signed-off-by: Yijing Wang <wangyijing@huawei.com>
Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-ia64@vger.kernel.org
Signed-off-by: Tony Luck <tony.luck@intel.com>
| -rw-r--r-- | arch/ia64/pci/pci.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c index 99a9f672d156..72a1957dfff3 100644 --- a/arch/ia64/pci/pci.c +++ b/arch/ia64/pci/pci.c @@ -369,6 +369,13 @@ static void __release_pci_root_info(struct pci_root_info *info) kfree(info); } +static void release_pci_root_info(struct pci_host_bridge *bridge) +{ + struct pci_root_info *info = bridge->release_data; + + __release_pci_root_info(info); +} + struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) { struct acpi_device *device = root->device; @@ -446,6 +453,8 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) return NULL; } + pci_set_host_bridge_release(to_pci_host_bridge(pbus->bridge), + release_pci_root_info, info); pci_scan_child_bus(pbus); return pbus; |