From a5a52a968f518de94e6bccc7bdd50dda79c108b7 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Wed, 28 Jun 2006 04:27:01 -0700 Subject: [PATCH] --- yaml --- r: 30979 b: refs/heads/master c: da574af755bcb1d604e01feadf2a8c31b364447c h: refs/heads/master i: 30977: 7c30c7f808d19bed166370c7680b0dd12be2334d 30975: abd44fd7a7b5932d02fecdc412299905642d5779 v: v3 --- [refs] | 2 +- trunk/drivers/ide/ide-io.c | 2 +- trunk/include/linux/ide.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 5b4f11b4ec97..03f4a07d79e9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2930d1bed7ffea3062e43b8acdeb9e0587bfc6a9 +refs/heads/master: da574af755bcb1d604e01feadf2a8c31b364447c diff --git a/trunk/drivers/ide/ide-io.c b/trunk/drivers/ide/ide-io.c index 935cb2583770..26ceab1e90bb 100644 --- a/trunk/drivers/ide/ide-io.c +++ b/trunk/drivers/ide/ide-io.c @@ -505,7 +505,7 @@ static ide_startstop_t ide_ata_error(ide_drive_t *drive, struct request *rq, u8 } } - if ((stat & DRQ_STAT) && rq_data_dir(rq) == READ) + if ((stat & DRQ_STAT) && rq_data_dir(rq) == READ && hwif->err_stops_fifo == 0) try_to_flush_leftover_data(drive); if (hwif->INB(IDE_STATUS_REG) & (BUSY_STAT|DRQ_STAT)) diff --git a/trunk/include/linux/ide.h b/trunk/include/linux/ide.h index ef7bef207f48..0c100168c0cf 100644 --- a/trunk/include/linux/ide.h +++ b/trunk/include/linux/ide.h @@ -793,6 +793,7 @@ typedef struct hwif_s { unsigned auto_poll : 1; /* supports nop auto-poll */ unsigned sg_mapped : 1; /* sg_table and sg_nents are ready */ unsigned no_io_32bit : 1; /* 1 = can not do 32-bit IO ops */ + unsigned err_stops_fifo : 1; /* 1=data FIFO is cleared by an error */ struct device gendev; struct completion gendev_rel_comp; /* To deal with device release() */