diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-10-18 18:30:10 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-10-18 18:30:10 -0400 |
commit | ed67b92385a5afddc98d5ff0894b2854c4a54dac (patch) | |
tree | bb5a72cbc383ffdc759c1c12a18fc5be54df69e2 /drivers/ide/pci/pdc202xx_old.c | |
parent | 40d2dd7ef3df468814a34cd3d31486408e604468 (diff) |
ide: add IDE_HFLAG_ERROR_STOPS_FIFO host flag
Add IDE_HFLAG_ERROR_STOPS_FIFO host flag and use it instead
of hwif->err_stops_fifo. As a side-effect this change fixes
hwif->err_stops_fifo not being restored by ide_hwif_restore().
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/pci/pdc202xx_old.c')
-rw-r--r-- | drivers/ide/pci/pdc202xx_old.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ide/pci/pdc202xx_old.c b/drivers/ide/pci/pdc202xx_old.c index 5b308d5c10ba..c34e5936a990 100644 --- a/drivers/ide/pci/pdc202xx_old.c +++ b/drivers/ide/pci/pdc202xx_old.c | |||
@@ -317,8 +317,6 @@ static void __devinit init_hwif_pdc202xx(ide_hwif_t *hwif) | |||
317 | if (hwif->pci_dev->device != PCI_DEVICE_ID_PROMISE_20246) | 317 | if (hwif->pci_dev->device != PCI_DEVICE_ID_PROMISE_20246) |
318 | hwif->resetproc = &pdc202xx_reset; | 318 | hwif->resetproc = &pdc202xx_reset; |
319 | 319 | ||
320 | hwif->err_stops_fifo = 1; | ||
321 | |||
322 | hwif->drives[0].autotune = hwif->drives[1].autotune = 1; | 320 | hwif->drives[0].autotune = hwif->drives[1].autotune = 1; |
323 | 321 | ||
324 | if (hwif->dma_base == 0) | 322 | if (hwif->dma_base == 0) |
@@ -393,7 +391,8 @@ static void __devinit pdc202ata4_fixup_irq(struct pci_dev *dev, | |||
393 | .init_hwif = init_hwif_pdc202xx, \ | 391 | .init_hwif = init_hwif_pdc202xx, \ |
394 | .init_dma = init_dma_pdc202xx, \ | 392 | .init_dma = init_dma_pdc202xx, \ |
395 | .extra = 48, \ | 393 | .extra = 48, \ |
396 | .host_flags = IDE_HFLAG_OFF_BOARD, \ | 394 | .host_flags = IDE_HFLAG_ERROR_STOPS_FIFO | \ |
395 | IDE_HFLAG_OFF_BOARD, \ | ||
397 | .pio_mask = ATA_PIO4, \ | 396 | .pio_mask = ATA_PIO4, \ |
398 | .mwdma_mask = ATA_MWDMA2, \ | 397 | .mwdma_mask = ATA_MWDMA2, \ |
399 | .udma_mask = udma, \ | 398 | .udma_mask = udma, \ |
@@ -406,7 +405,8 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = { | |||
406 | .init_hwif = init_hwif_pdc202xx, | 405 | .init_hwif = init_hwif_pdc202xx, |
407 | .init_dma = init_dma_pdc202xx, | 406 | .init_dma = init_dma_pdc202xx, |
408 | .extra = 16, | 407 | .extra = 16, |
409 | .host_flags = IDE_HFLAG_OFF_BOARD, | 408 | .host_flags = IDE_HFLAG_ERROR_STOPS_FIFO | |
409 | IDE_HFLAG_OFF_BOARD, | ||
410 | .pio_mask = ATA_PIO4, | 410 | .pio_mask = ATA_PIO4, |
411 | .mwdma_mask = ATA_MWDMA2, | 411 | .mwdma_mask = ATA_MWDMA2, |
412 | .udma_mask = ATA_UDMA2, | 412 | .udma_mask = ATA_UDMA2, |