summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-12-02 20:40:03 +0100
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-12-02 20:40:03 +0100
commite9eb8388306364295308132265c00bea685f409f (patch)
tree6f2ef0c8a08a9b4b5d07781a85b11cf40f4b7e01 /drivers
parentc7b997b372e8b6e7ee8d91696c74a556754f5fdb (diff)
downloadlinux-e9eb8388306364295308132265c00bea685f409f.tar.gz
linux-e9eb8388306364295308132265c00bea685f409f.tar.bz2
linux-e9eb8388306364295308132265c00bea685f409f.zip
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ide/ide-io.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 0be7c4eb11c3..702a627b0083 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;
}