summaryrefslogtreecommitdiffstats
path: root/drivers/ide/sc1200.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz2009-03-31 20:15:22 +0200
committerBartlomiej Zolnierkiewicz2009-03-31 20:15:22 +0200
commit88b4132e101e60e8fa67996ae3072ab6b71e8500 (patch)
tree6b65c2d0d8691c577d60e6d1f84ad6db172a82d7 /drivers/ide/sc1200.c
parentide: move ide_map_sg() call out of ->dma_setup method (take 2) (diff)
downloadkernel-qcow2-linux-88b4132e101e60e8fa67996ae3072ab6b71e8500.tar.gz
kernel-qcow2-linux-88b4132e101e60e8fa67996ae3072ab6b71e8500.tar.xz
kernel-qcow2-linux-88b4132e101e60e8fa67996ae3072ab6b71e8500.zip
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/sc1200.c')
-rw-r--r--drivers/ide/sc1200.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/ide/sc1200.c b/drivers/ide/sc1200.c
index d9c47034bedd..13e3988f00f0 100644
--- a/drivers/ide/sc1200.c
+++ b/drivers/ide/sc1200.c
@@ -183,8 +183,6 @@ static int sc1200_dma_end(ide_drive_t *drive)
outb(dma_stat|0x1b, dma_base+2); /* clear the INTR & ERROR bits */
outb(inb(dma_base)&~1, dma_base); /* !! DO THIS HERE !! stop DMA */
- drive->waiting_for_dma = 0;
-
return (dma_stat & 7) != 4; /* verify good DMA status */
}