From: David S. Miller <davem@sunset.davemloft.net>
Date: Wed, 15 Feb 2006 00:44:39 +0000 (-0800)
Subject: [SPARC64]: Explicitly init *nregs to 0 in find_device_prom_node().
X-Git-Tag: v2.6.17-rc1~1184^2~111
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=355db99860a1d77d77cd2fc66e2f5ab58f3e0995;p=linux-2.6

[SPARC64]: Explicitly init *nregs to 0 in find_device_prom_node().

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/arch/sparc64/kernel/pci_common.c b/arch/sparc64/kernel/pci_common.c
index 1b1f89b35f..b2d21b11a2 100644
--- a/arch/sparc64/kernel/pci_common.c
+++ b/arch/sparc64/kernel/pci_common.c
@@ -39,6 +39,8 @@ static int __init find_device_prom_node(struct pci_pbm_info *pbm,
 {
 	int node;
 
+	*nregs = 0;
+
 	/*
 	 * Return the PBM's PROM node in case we are it's PCI device,
 	 * as the PBM's reg property is different to standard PCI reg
@@ -51,10 +53,8 @@ static int __init find_device_prom_node(struct pci_pbm_info *pbm,
 	     pdev->device == PCI_DEVICE_ID_SUN_SCHIZO ||
 	     pdev->device == PCI_DEVICE_ID_SUN_TOMATILLO ||
 	     pdev->device == PCI_DEVICE_ID_SUN_SABRE ||
-	     pdev->device == PCI_DEVICE_ID_SUN_HUMMINGBIRD)) {
-		*nregs = 0;
+	     pdev->device == PCI_DEVICE_ID_SUN_HUMMINGBIRD))
 		return bus_prom_node;
-	}
 
 	node = prom_getchild(bus_prom_node);
 	while (node != 0) {