* [PATCH 03/40] PCI, ia64: clear initial value for root info resources
[not found] ` <1348080894-23412-1-git-send-email-yinghai@kernel.org>
@ 2012-09-19 18:54 ` Yinghai Lu
0 siblings, 0 replies; only message in thread
From: Yinghai Lu @ 2012-09-19 18:54 UTC (permalink / raw)
To: Bjorn Helgaas, Len Brown, Taku Izumi, Jiang Liu, x86
Cc: Andrew Morton, Linus Torvalds, Greg Kroah-Hartman, linux-pci,
linux-kernel, linux-acpi, Yinghai Lu, Tony Luck, Fenghua Yu,
linux-ia64
after
PCI, x86: clear initial value for root info resources
change ia64 code accordingly, because later ia64 will support root bus removal too.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: linux-ia64@vger.kernel.org
---
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 a7ebe94..5faa66c 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;
--
1.7.7
^ permalink raw reply related [flat|nested] only message in thread