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

• Lines: 24
• Date: Tue Jan 4 10:12:14 2000
• Orig file: v2.2.13/linux/drivers/block/ide-dma.c
• Orig date: Tue May 11 14:58:46 1999

diff -u --recursive --new-file v2.2.13/linux/drivers/block/ide-dma.c linux/drivers/block/ide-dma.c
@@ -136,7 +136,7 @@
 /*
  * dma_intr() is the handler for disk read/write DMA interrupts
  */
-void ide_dma_intr (ide_drive_t *drive)
+ide_startstop_t ide_dma_intr (ide_drive_t *drive)
 {
 	int i;
 	byte stat, dma_stat;
@@ -151,12 +151,11 @@
 				i -= rq->current_nr_sectors;
 				ide_end_request(1, HWGROUP(drive));
 			}
-			return;
+			return ide_stopped;
 		}
 		printk("%s: dma_intr: bad DMA status\n", drive->name);
 	}
-	ide__sti();	/* local CPU only */
-	ide_error(drive, "dma_intr", stat);
+	return ide_error(drive, "dma_intr", stat);
 }
 
 /*