From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Tue, 2 Dec 2008 19:40:03 +0000 (+0100)
Subject: ide: respect current DMA setting during resume
X-Git-Tag: v2.6.28-rc8~75^2~3
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e9eb8388306364295308132265c00bea685f409f;p=linux-2.6-omap-h63xx.git

ide: respect current DMA setting during resume

Respect current DMA setting during resume, otherwise PIO timings
may get destroyed if host uses shared PIO/MWDMA timings.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
---

diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 0be7c4eb11c..702a627b008 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -204,10 +204,8 @@ static ide_startstop_t ide_start_power_step(ide_drive_t *drive, struct request *
 		 */
 		if (drive->hwif->dma_ops == NULL)
 			break;
-		/*
-		 * TODO: respect IDE_DFLAG_USING_DMA
-		 */
-		ide_set_dma(drive);
+		if (drive->dev_flags & IDE_DFLAG_USING_DMA)
+			ide_set_dma(drive);
 		break;
 	}