From: Harvey Harrison <harvey.harrison@gmail.com>
Date: Thu, 14 Feb 2008 05:14:05 +0000 (-0800)
Subject: ata: fix sparse warning in ata_piix.c
X-Git-Tag: v2.6.25-rc3~137^2~11
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=018d982721209241ede1180aa795d68833c26b10;p=linux-2.6-omap-h63xx.git

ata: fix sparse warning in ata_piix.c

drivers/ata/ata_piix.c:1655:8: warning: symbol 'rc' shadows an earlier one
drivers/ata/ata_piix.c:1616:6: originally declared here

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
---

diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
index 9c2515f67de..752e7d2f3b2 100644
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -1652,7 +1652,7 @@ static int __devinit piix_init_one(struct pci_dev *pdev,
 		u8 tmp;
 		pci_read_config_byte(pdev, PIIX_SCC, &tmp);
 		if (tmp == PIIX_AHCI_DEVICE) {
-			int rc = piix_disable_ahci(pdev);
+			rc = piix_disable_ahci(pdev);
 			if (rc)
 				return rc;
 		}