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/ide-io.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/ide-io.c')
| -rw-r--r-- | drivers/ide/ide-io.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c index ec835e37e729..5c8b008676fb 100644 --- a/drivers/ide/ide-io.c +++ b/drivers/ide/ide-io.c | |||
| @@ -484,7 +484,8 @@ static ide_startstop_t ide_ata_error(ide_drive_t *drive, struct request *rq, u8 | |||
| 484 | } | 484 | } |
| 485 | } | 485 | } |
| 486 | 486 | ||
| 487 | if ((stat & DRQ_STAT) && rq_data_dir(rq) == READ && hwif->err_stops_fifo == 0) | 487 | if ((stat & DRQ_STAT) && rq_data_dir(rq) == READ && |
| 488 | (hwif->host_flags & IDE_HFLAG_ERROR_STOPS_FIFO) == 0) | ||
| 488 | try_to_flush_leftover_data(drive); | 489 | try_to_flush_leftover_data(drive); |
| 489 | 490 | ||
| 490 | if (rq->errors >= ERROR_MAX || blk_noretry_request(rq)) { | 491 | if (rq->errors >= ERROR_MAX || blk_noretry_request(rq)) { |