From 4460c612f76fdf0127b974a41b50676bef0bb2bf Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Wed, 19 Sep 2012 11:54:17 -0700 Subject: [PATCH] --- yaml --- r: 324277 b: refs/heads/master c: da104919059bd89dc77a77d74b0fb289384ce9b1 h: refs/heads/master i: 324275: 293e96ea5d7738c8f1f08c6c11b1eddf09296c8e v: v3 --- [refs] | 2 +- trunk/arch/ia64/pci/pci.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 33855b8cf8ab..9089862cc3dd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4cd8daf05c7071ac80008c8d4368860110fa6466 +refs/heads/master: da104919059bd89dc77a77d74b0fb289384ce9b1 diff --git a/trunk/arch/ia64/pci/pci.c b/trunk/arch/ia64/pci/pci.c index 81acc7a57f3e..8da4670b6ce9 100644 --- a/trunk/arch/ia64/pci/pci.c +++ b/trunk/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;