From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Mon, 8 Dec 2008 16:42:35 +0000 (+0100)
Subject: Revert "ide: respect current DMA setting during resume"
X-Git-Tag: MMI-PSA29.97-13-9~30587^2~1
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1a659880ee755d96eeabe64bded059abed6d5ef5;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Revert "ide: respect current DMA setting during resume"

This reverts commit e9eb8388306364295308132265c00bea685f409f since
it could break resume (thanks to Paul Collins for the report).

I'll look into sorting this out properly for 2.6.29
but for 2.6.28 it is the best to just revert my patch.

Reported-by: Paul Collins <paul@burly.ondioline.org>
Cc: rjw@sisk.pl
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
---

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