summaryrefslogtreecommitdiffstats
path: root/arch/ia64/pci
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2012-09-24 17:24:11 -0600
committerBjorn Helgaas <bhelgaas@google.com>2012-09-24 17:24:11 -0600
commit78c8f84302ce007aedcfa11912fd4aacf22727ab (patch)
treef7a699c34875cd33c2e6c1301b740adb0ba4054f /arch/ia64/pci
parentd3ce52f50cc1697504130897f1d7c489b62dae1c (diff)
parent84544a1dea61879edebceddb7a76d5737409f8c8 (diff)
downloadlinux-78c8f84302ce007aedcfa11912fd4aacf22727ab.tar.bz2
Merge branch 'pci/yinghai-misc' into next
Diffstat (limited to 'arch/ia64/pci')
-rw-r--r--arch/ia64/pci/pci.c3
1 files changed, 1 insertions, 2 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;