diff options
Diffstat (limited to 'arch/ia64/pci/pci.c')
| -rw-r--r-- | arch/ia64/pci/pci.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c index 3549f3b42592..73696b4a2eed 100644 --- a/arch/ia64/pci/pci.c +++ b/arch/ia64/pci/pci.c | |||
| @@ -354,10 +354,13 @@ pci_acpi_scan_root(struct acpi_device *device, int domain, int bus) | |||
| 354 | 354 | ||
| 355 | acpi_walk_resources(device->handle, METHOD_NAME__CRS, count_window, | 355 | acpi_walk_resources(device->handle, METHOD_NAME__CRS, count_window, |
| 356 | &windows); | 356 | &windows); |
| 357 | controller->window = kmalloc_node(sizeof(*controller->window) * windows, | 357 | if (windows) { |
| 358 | GFP_KERNEL, controller->node); | 358 | controller->window = |
| 359 | if (!controller->window) | 359 | kmalloc_node(sizeof(*controller->window) * windows, |
| 360 | goto out2; | 360 | GFP_KERNEL, controller->node); |
| 361 | if (!controller->window) | ||
| 362 | goto out2; | ||
| 363 | } | ||
| 361 | 364 | ||
| 362 | name = kmalloc(16, GFP_KERNEL); | 365 | name = kmalloc(16, GFP_KERNEL); |
| 363 | if (!name) | 366 | if (!name) |
