after
        PCI, ia64: 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 <ying...@kernel.org>
Cc: Tony Luck <tony.l...@intel.com>
Cc: Fenghua Yu <fenghua...@intel.com>
Cc: linux-i...@vger.kernel.org

---
 arch/ia64/pci/pci.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Index: linux-2.6/arch/ia64/pci/pci.c
===================================================================
--- linux-2.6.orig/arch/ia64/pci/pci.c
+++ linux-2.6/arch/ia64/pci/pci.c
@@ -295,7 +295,6 @@ static __devinit acpi_status add_window(
        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
                        &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;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to