From c9df5ad725cefe0261d68c35a55b5315d7337d1c Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Mon, 22 May 2006 22:58:14 +0100 Subject: [PATCH] --- yaml --- r: 29463 b: refs/heads/master c: 31a34fe75906ba5f61606eaed01da313f29ca4b1 h: refs/heads/master i: 29461: ee4a98a594791d7c42bd7ae759d2bf050661b2c6 29459: efaebcf96405cba8f5b7cbea29a7b8316321a34f 29455: 0b7987da38d6186c5c2d509af345a7b1831c13ff v: v3 --- [refs] | 2 +- trunk/drivers/scsi/ata_piix.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 877b1c29559a..b50397bd3551 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e14698745dd0de1ddbf5cd0cca4313a90f8c1cc1 +refs/heads/master: 31a34fe75906ba5f61606eaed01da313f29ca4b1 diff --git a/trunk/drivers/scsi/ata_piix.c b/trunk/drivers/scsi/ata_piix.c index 28bd8cae52ce..1db007f41a61 100644 --- a/trunk/drivers/scsi/ata_piix.c +++ b/trunk/drivers/scsi/ata_piix.c @@ -767,15 +767,15 @@ static int __devinit piix_check_450nx_errata(struct pci_dev *ata_dev) pci_read_config_byte(pdev, PCI_REVISION_ID, &rev); pci_read_config_word(pdev, 0x41, &cfg); /* Only on the original revision: IDE DMA can hang */ - if(rev == 0x00) + if (rev == 0x00) no_piix_dma = 1; /* On all revisions below 5 PXB bus lock must be disabled for IDE */ - else if(cfg & (1<<14) && rev < 5) + else if (cfg & (1<<14) && rev < 5) no_piix_dma = 2; } - if(no_piix_dma) + if (no_piix_dma) dev_printk(KERN_WARNING, &ata_dev->dev, "450NX errata present, disabling IDE DMA.\n"); - if(no_piix_dma == 2) + if (no_piix_dma == 2) dev_printk(KERN_WARNING, &ata_dev->dev, "A BIOS update may resolve this.\n"); return no_piix_dma; }