1 files changed, 21 insertions, 1 deletions

diff --git a/arch/x86/pci/mmconfig_64.c b/arch/x86/pci/mmconfig_64.c
index 9207fd49233c..a1994163c99d 100644
--- a/arch/x86/pci/mmconfig_64.c
+++ b/arch/x86/pci/mmconfig_64.c
@@ -127,7 +127,7 @@ static void __iomem * __init mcfg_ioremap(struct acpi_mcfg_allocation *cfg)
 int __init pci_mmcfg_arch_init(void)
 {
         int i;
-        pci_mmcfg_virt = kmalloc(sizeof(*pci_mmcfg_virt) *
+        pci_mmcfg_virt = kzalloc(sizeof(*pci_mmcfg_virt) *
                                  pci_mmcfg_config_num, GFP_KERNEL);
         if (pci_mmcfg_virt == NULL) {
                 printk(KERN_ERR "PCI: Can not allocate memory for mmconfig structures\n");
@@ -141,9 +141,29 @@ int __init pci_mmcfg_arch_init(void)
                         printk(KERN_ERR "PCI: Cannot map mmconfig aperture for "
                                         "segment %d\n",
                                 pci_mmcfg_config[i].pci_segment);
+                        pci_mmcfg_arch_free();
                         return 0;
                 }
         }
         raw_pci_ext_ops = &pci_mmcfg;
         return 1;
 }
+
+void __init pci_mmcfg_arch_free(void)
+{
+        int i;
+
+        if (pci_mmcfg_virt == NULL)
+                return;
+
+        for (i = 0; i < pci_mmcfg_config_num; ++i) {
+                if (pci_mmcfg_virt[i].virt) {
+                        iounmap(pci_mmcfg_virt[i].virt);
+                        pci_mmcfg_virt[i].virt = NULL;
+                        pci_mmcfg_virt[i].cfg = NULL;
+                }
+        }
+
+        kfree(pci_mmcfg_virt);
+        pci_mmcfg_virt = NULL;
+}