diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-04 07:40:19 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-04 07:40:19 +0000 |
| commit | 33263fc5f9ac8e8cb2b22d06af3ce5ac1dd815e4 (patch) | |
| tree | 2d1b86a40bef0958a68cf1a2eafbeb0667a70543 /drivers/block/ide-dma.c | |
| parent | 216f5f51aa02f8b113aa620ebc14a9631a217a00 (diff) | |
Merge with Linux 2.3.32.
Diffstat (limited to 'drivers/block/ide-dma.c')
| -rw-r--r-- | drivers/block/ide-dma.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/block/ide-dma.c b/drivers/block/ide-dma.c index 7712b6cd6..083039e62 100644 --- a/drivers/block/ide-dma.c +++ b/drivers/block/ide-dma.c @@ -186,7 +186,7 @@ const char *bad_dma_drives[] = {"WDC AC11000H", /* * 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; @@ -201,12 +201,11 @@ void ide_dma_intr (ide_drive_t *drive) 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); } /* |