Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6

[linux-2.6.git] / drivers / ide / pci / pdc202xx_new.c

diff --git a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c
index 20d5965726432c1c65c9f6307860dad6b721cf47..5a8334d134fbda2d1caebb0ab0ea4e93444f80e9 100644 (file)
--- a/drivers/ide/pci/pdc202xx_new.c
+++ b/drivers/ide/pci/pdc202xx_new.c
@@ -338,6 +338,8 @@ static void __devinit init_hwif_pdc202new(ide_hwif_t *hwif)
        hwif->ultra_mask = 0x7f;
        hwif->mwdma_mask = 0x07;
 
        hwif->ultra_mask = 0x7f;
        hwif->mwdma_mask = 0x07;
 

+       hwif->err_stops_fifo = 1;
+

        hwif->ide_dma_check = &pdcnew_config_drive_xfer_rate;
        hwif->ide_dma_lostirq = &pdcnew_ide_dma_lostirq;
        hwif->ide_dma_timeout = &pdcnew_ide_dma_timeout;
        hwif->ide_dma_check = &pdcnew_config_drive_xfer_rate;
        hwif->ide_dma_lostirq = &pdcnew_ide_dma_lostirq;
        hwif->ide_dma_timeout = &pdcnew_ide_dma_timeout;