diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-13 14:48:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-13 14:48:14 -0700 |
| commit | 7c22a3d853804d2716ef4f90cdd693a83819ba11 (patch) | |
| tree | b0f5f71166c85e4178d9b3658be9a2ab35591bd6 /drivers/ata/ata_piix.c | |
| parent | 0cb60efd03ed82d02f44a14594714367e59e8abc (diff) | |
| parent | 97b697a11b07e2ebfa69c488132596cc5eb24119 (diff) | |
| download | op-kernel-dev-7c22a3d853804d2716ef4f90cdd693a83819ba11.zip op-kernel-dev-7c22a3d853804d2716ef4f90cdd693a83819ba11.tar.gz | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
[libata] LBA28/LBA48 off-by-one bug in ata.h
sata_inic162x: enable LED blinking
ata: duplicate variable sparse warning
Diffstat (limited to 'drivers/ata/ata_piix.c')
| -rw-r--r-- | drivers/ata/ata_piix.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c index b1d08a8..e6b4606 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; } |
