Merge branch 'pci/yinghai-misc' into next

2 files changed, 2 insertions, 4 deletions

diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
index a7ebe9440271..5faa66c5c2a8 100644
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
@@ -295,7 +295,6 @@ static __devinit acpi_status add_window(struct acpi_resource *res, void *data)
         window->resource.flags = flags;
         window->resource.start = addr.minimum + offset;
         window->resource.end = window->resource.start + addr.address_length - 1;
-        window->resource.child = NULL;
         window->offset = offset;
 
         if (insert_resource(root, &window->resource)) {
@@ -357,7 +356,7 @@ pci_acpi_scan_root(struct acpi_pci_root *root)
                         &windows);
         if (windows) {
                 controller->window =
-                        kmalloc_node(sizeof(*controller->window) * windows,
+                        kzalloc_node(sizeof(*controller->window) * windows,
                                      GFP_KERNEL, controller->node);
                 if (!controller->window)
                         goto out2;
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
index 505acdd6d600..192397c98606 100644
--- a/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
@@ -305,7 +305,6 @@ setup_resource(struct acpi_resource *acpi_res, void *data)
         res->flags = flags;
         res->start = start;
         res->end = end;
-        res->child = NULL;
 
         if (!pci_use_crs) {
                 dev_printk(KERN_DEBUG, &info->bridge->dev,
@@ -434,7 +433,7 @@ probe_pci_root_info(struct pci_root_info *info, struct acpi_device *device,
 
         size = sizeof(*info->res) * info->res_num;
         info->res_num = 0;
-        info->res = kmalloc(size, GFP_KERNEL);
+        info->res = kzalloc(size, GFP_KERNEL);
         if (!info->res)
                 return;