diff options
| -rw-r--r-- | arch/ia64/pci/pci.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c index 81acc7a57f3e..8da4670b6ce9 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) | |||
| 295 | window->resource.flags = flags; | 295 | window->resource.flags = flags; |
| 296 | window->resource.start = addr.minimum + offset; | 296 | window->resource.start = addr.minimum + offset; |
| 297 | window->resource.end = window->resource.start + addr.address_length - 1; | 297 | window->resource.end = window->resource.start + addr.address_length - 1; |
| 298 | window->resource.child = NULL; | ||
| 299 | window->offset = offset; | 298 | window->offset = offset; |
| 300 | 299 | ||
| 301 | if (insert_resource(root, &window->resource)) { | 300 | if (insert_resource(root, &window->resource)) { |
| @@ -357,7 +356,7 @@ pci_acpi_scan_root(struct acpi_pci_root *root) | |||
| 357 | &windows); | 356 | &windows); |
| 358 | if (windows) { | 357 | if (windows) { |
| 359 | controller->window = | 358 | controller->window = |
| 360 | kmalloc_node(sizeof(*controller->window) * windows, | 359 | kzalloc_node(sizeof(*controller->window) * windows, |
| 361 | GFP_KERNEL, controller->node); | 360 | GFP_KERNEL, controller->node); |
| 362 | if (!controller->window) | 361 | if (!controller->window) |
| 363 | goto out2; | 362 | goto out2; |
