patch-2.3.23 linux/drivers/block/ide-dma.c

• Lines: 34
• Date: Tue Oct 19 10:22:20 1999
• Orig file: v2.3.22/linux/drivers/block/ide-dma.c
• Orig date: Mon Oct 11 15:38:14 1999

diff -u --recursive --new-file v2.3.22/linux/drivers/block/ide-dma.c linux/drivers/block/ide-dma.c
@@ -420,7 +420,8 @@
 			drive->waiting_for_dma = 1;
 			if (drive->media != ide_disk)
 				return 0;
-			ide_set_handler(drive, &ide_dma_intr, WAIT_CMD);/* issue cmd to drive */
+			drive->timeout = WAIT_CMD;
+			ide_set_handler(drive, &ide_dma_intr);/* issue cmd to drive */
 			OUT_BYTE(reading ? WIN_READDMA : WIN_WRITEDMA, IDE_COMMAND_REG);
 		case ide_dma_begin:
 			/* Note that this is done *after* the cmd has
@@ -460,7 +461,7 @@
 int ide_release_dma (ide_hwif_t *hwif)
 {
 	if (hwif->dmatable) {
-		clear_page((unsigned long)hwif->dmatable);	/* clear PRD 1st */
+		clear_page((void *)hwif->dmatable);	/* clear PRD 1st */
 		free_page((unsigned long)hwif->dmatable);	/* free PRD 2nd */
 	}
 	if ((hwif->dma_extra) && (hwif->channel == 0))
@@ -537,14 +538,7 @@
 
 		switch(dev->device) {
 			case PCI_DEVICE_ID_CMD_643:
-#ifdef CONFIG_BLK_DEV_ALI15X3
 			case PCI_DEVICE_ID_AL_M5219:
-			case PCI_DEVICE_ID_AL_M5229:
-				/*
-				 * Ali 15x3 chipsets know as ALI IV and V report
-				 * this as simplex, skip this test for them.
-				 */
-#endif /* CONFIG_BLK_DEV_ALI15X3 */
 				outb(inb(dma_base+2) & 0x60, dma_base+2);
 				if (inb(dma_base+2) & 0x80) {
 					printk("%s: simplex device: DMA forced\n", name);