commit f37aaf9edeba3f4ae10d22aefc09c06af9ea39b6
author Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Sat Jan 26 20:13:02 2008 +0100
committer Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Sat Jan 26 20:13:02 2008 +0100
tree 167b73d875f3f5c36e9c4378d6e499cf08a46205
parent 8ae60e34dd737ed3bef64b08130478393d9c4e8a

ide: move drive->using_dma check to callers of ->dma_host_on method

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

drivers/ide/ide-iops.c

diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index 76cb5f2..e30f67e 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -799,7 +799,8 @@
 
  skip:
 #ifdef CONFIG_BLK_DEV_IDEDMA
-	if (speed >= XFER_SW_DMA_0 || (hwif->host_flags & IDE_HFLAG_VDMA))
+	if ((speed >= XFER_SW_DMA_0 || (hwif->host_flags & IDE_HFLAG_VDMA)) &&
+	    drive->using_dma)
 		hwif->dma_host_on(drive);
 	else if (hwif->dma_host_on)	/* check if host supports DMA */
 		ide_dma_off_quietly(drive);