From: David S. Miller <davem@davemloft.net>
Date: Fri, 12 Sep 2008 07:01:03 +0000 (-0700)
Subject: sparc64: Fix sparse warnings in pci_sun4v.c
X-Git-Tag: v2.6.28-rc1~706^2~27
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8d2aec512304144cbb4f7dbb484626fb598b698e;p=linux-2.6-omap-h63xx.git

sparc64: Fix sparse warnings in pci_sun4v.c

'err' variable shadowing in pci_sun4v_probe()

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

diff --git a/arch/sparc64/kernel/pci_sun4v.c b/arch/sparc64/kernel/pci_sun4v.c
index 97a77bcd255..e86c73ec167 100644
--- a/arch/sparc64/kernel/pci_sun4v.c
+++ b/arch/sparc64/kernel/pci_sun4v.c
@@ -942,9 +942,9 @@ static int __devinit pci_sun4v_probe(struct of_device *op,
 	dp = op->node;
 
 	if (!hvapi_negotiated++) {
-		int err = sun4v_hvapi_register(HV_GRP_PCI,
-					       vpci_major,
-					       &vpci_minor);
+		err = sun4v_hvapi_register(HV_GRP_PCI,
+					   vpci_major,
+					   &vpci_minor);
 
 		if (err) {
 			printk(KERN_ERR PFX "Could not register hvapi, "