Commit 1a659880 authored Dec 08, 2008 by Bartlomiej Zolnierkiewicz

Revert "ide: respect current DMA setting during resume"



This reverts commit e9eb8388 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>

parent 218d11a8

drivers/ide/ide-io.c

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -208,7 +208,9 @@ static ide_startstop_t ide_start_power_step(ide_drive_t drive, struct request
	*/		*/
	if (drive->hwif->dma_ops == NULL)		if (drive->hwif->dma_ops == NULL)
	break;		break;
	if (drive->dev_flags & IDE_DFLAG_USING_DMA)		/*
			* TODO: respect IDE_DFLAG_USING_DMA
			*/
	ide_set_dma(drive);		ide_set_dma(drive);
	break;		break;
	}		}