From 6677d8e2d3c3569e5a82c8394603e193bf4ec1b7 Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yinghai@kernel.org>
Date: Wed, 19 Sep 2012 10:49:00 -0700
Subject: [PATCH] --- yaml --- r: 324276 b: refs/heads/master c:
 4cd8daf05c7071ac80008c8d4368860110fa6466 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/arch/x86/pci/acpi.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 22e59c3b5863..33855b8cf8ab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 817a268516f3aaf9e54c5a0f880de37d03ef4c79
+refs/heads/master: 4cd8daf05c7071ac80008c8d4368860110fa6466
diff --git a/trunk/arch/x86/pci/acpi.c b/trunk/arch/x86/pci/acpi.c
index 505acdd6d600..192397c98606 100644
--- a/trunk/arch/x86/pci/acpi.c
+++ b/trunk/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;