If the controller FIFO cleared automatically on error we must not try and drain it as this will hang some chips. Signed-off-by: Alan Cox <alan@xxxxxxxxxx> Based in concept on a broken patch from -mm some while back diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.17/drivers/ide/ide-io.c linux-2.6.17/drivers/ide/ide-io.c --- linux.vanilla-2.6.17/drivers/ide/ide-io.c 2006-06-19 17:17:24.000000000 +0100 +++ linux-2.6.17/drivers/ide/ide-io.c 2006-06-26 13:49:56.377579264 +0100 @@ -444,7 +444,7 @@ } } - 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 -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.17/include/linux/ide.h linux-2.6.17/include/linux/ide.h --- linux.vanilla-2.6.17/include/linux/ide.h 2006-06-19 17:29:50.000000000 +0100 +++ linux-2.6.17/include/linux/ide.h 2006-06-26 13:50:53.218938064 +0100 @@ -793,6 +793,7 @@ 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() */ - : send the line "unsubscribe linux-ide" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
