summaryrefslogtreecommitdiff
path: root/drivers/ide/ide-atapi.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-03-31 22:15:22 +0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-03-31 22:15:22 +0400
commit88b4132e101e60e8fa67996ae3072ab6b71e8500 (patch)
tree6b65c2d0d8691c577d60e6d1f84ad6db172a82d7 /drivers/ide/ide-atapi.c
parent11998b316173f814698f9037ce9179d634d1f423 (diff)
downloadlinux-88b4132e101e60e8fa67996ae3072ab6b71e8500.tar.xz
ide: set/clear drive->waiting_for_dma flag in the core code
Set/clear drive->waiting_for_dma flag in the core code instead of in ->dma_setup and ->dma_end methods. There should be no functional changes caused by this patch. Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-atapi.c')
-rw-r--r--drivers/ide/ide-atapi.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c
index 89d2339bdef3..db6e617790bd 100644
--- a/drivers/ide/ide-atapi.c
+++ b/drivers/ide/ide-atapi.c
@@ -342,8 +342,10 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive)
stat = tp_ops->read_status(hwif);
if (pc->flags & PC_FLAG_DMA_IN_PROGRESS) {
- int rc = hwif->dma_ops->dma_end(drive);
+ int rc;
+ drive->waiting_for_dma = 0;
+ rc = hwif->dma_ops->dma_end(drive);
ide_destroy_dmatable(drive);
if (rc || (drive->media == ide_tape && (stat & ATA_ERR))) {