patch-2.3.26 linux/drivers/block/ide-pmac.c

Next file: linux/drivers/block/ide-tape.c
Previous file: linux/drivers/block/ide-floppy.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.25/linux/drivers/block/ide-pmac.c linux/drivers/block/ide-pmac.c
@@ -363,8 +363,7 @@
 		drive->waiting_for_dma = 1;
 		if (drive->media != ide_disk)
 			return 0;
-		drive->timeout = WAIT_CMD;
-		ide_set_handler(drive, &ide_dma_intr);
+		ide_set_handler(drive, &ide_dma_intr, WAIT_CMD, NULL);
 		OUT_BYTE(func==ide_dma_write? WIN_WRITEDMA: WIN_READDMA,
 			 IDE_COMMAND_REG);
 	case ide_dma_begin:

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)