summaryrefslogtreecommitdiffstats
path: root/arch/x86/pci/acpi.c
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2012-09-19 10:49:00 -0700
committerBjorn Helgaas <bhelgaas@google.com>2012-09-21 14:52:28 -0600
commit4cd8daf05c7071ac80008c8d4368860110fa6466 (patch)
treee42fcea6f27656e321309d13b49468a140283916 /arch/x86/pci/acpi.c
parent817a268516f3aaf9e54c5a0f880de37d03ef4c79 (diff)
downloadop-kernel-dev-4cd8daf05c7071ac80008c8d4368860110fa6466.zip
op-kernel-dev-4cd8daf05c7071ac80008c8d4368860110fa6466.tar.gz
x86/PCI: Clear host bridge aperture struct resource
Use kzalloc() so the struct resource doesn't contain garbage in fields we don't initialize. [bhelgaas: changelog] Signed-off-by: Yinghai Lu <yinghai@kernel.org> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Cc: x86@kernel.org
Diffstat (limited to 'arch/x86/pci/acpi.c')
-rw-r--r--arch/x86/pci/acpi.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
index 505acdd..192397c 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;
OpenPOWER on IntegriCloud