From: Stephen Hemminger <shemminger@vyatta.com>
Date: Mon, 8 Sep 2008 16:31:39 +0000 (-0700)
Subject: ata: duplicate variable sparse warning
X-Git-Tag: v2.6.27-rc7~28^2~2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=da3ceb2288d0b50373b69d57a81c34fdd7cd11aa;p=linux-2.6-omap-h63xx.git

ata: duplicate variable sparse warning

drivers/ata/ata_piix.c:1502:7: warning: symbol 'rc' shadows an earlier one

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
---

diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
index b1d08a8f500..e6b4606e36b 100644
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -1499,7 +1499,7 @@ static int __devinit piix_init_one(struct pci_dev *pdev,
 	 * off.
 	 */
 	if (pdev->vendor == PCI_VENDOR_ID_INTEL && pdev->device == 0x2652) {
-		int rc = piix_disable_ahci(pdev);
+		rc = piix_disable_ahci(pdev);
 		if (rc)
 			return rc;
 	}