patch-2.1.124 linux/drivers/block/ns87415.c

• Lines: 11
• Date: Sun Oct 4 10:22:43 1998
• Orig file: v2.1.123/linux/drivers/block/ns87415.c
• Orig date: Thu Aug 6 14:06:31 1998

diff -u --recursive --new-file v2.1.123/linux/drivers/block/ns87415.c linux/drivers/block/ns87415.c
@@ -74,8 +74,8 @@
 		case ide_dma_end: /* returns 1 on error, 0 otherwise */
 			drive->waiting_for_dma = 0;
 			dma_stat = inb(hwif->dma_base+2);
-			outb(7, hwif->dma_base);		/* from errata: stop DMA, clear INTR & ERROR */
-			outb(dma_stat|6, hwif->dma_base+2);	/* clear the INTR & ERROR bits */
+			outb(inb(hwif->dma_base)&~1, hwif->dma_base);	/* stop DMA */
+			outb(inb(hwif->dma_base)|6, hwif->dma_base);	/* from ERRATA: clear the INTR & ERROR bits */
 			return (dma_stat & 7) != 4;		/* verify good DMA status */
 		case ide_dma_write:
 		case ide_dma_read: