diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2012-09-24 17:24:11 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-09-24 17:24:11 -0600 |
| commit | 78c8f84302ce007aedcfa11912fd4aacf22727ab (patch) | |
| tree | f7a699c34875cd33c2e6c1301b740adb0ba4054f /arch/x86/pci | |
| parent | d3ce52f50cc1697504130897f1d7c489b62dae1c (diff) | |
| parent | 84544a1dea61879edebceddb7a76d5737409f8c8 (diff) | |
| download | linux-3.10-78c8f84302ce007aedcfa11912fd4aacf22727ab.tar.gz linux-3.10-78c8f84302ce007aedcfa11912fd4aacf22727ab.tar.bz2 linux-3.10-78c8f84302ce007aedcfa11912fd4aacf22727ab.zip | |
Merge branch 'pci/yinghai-misc' into next
Diffstat (limited to 'arch/x86/pci')
| -rw-r--r-- | arch/x86/pci/acpi.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c index 505acdd6d60..192397c9860 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; |