]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
ide: respect current DMA setting during resume
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Tue, 2 Dec 2008 19:40:03 +0000 (20:40 +0100)
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Tue, 2 Dec 2008 19:40:03 +0000 (20:40 +0100)
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>
drivers/ide/ide-io.c

index 0be7c4eb11c3dd8ebdbcac8f875d7863956728e0..702a627b0083ffbdc7c8615a21088c626cef1e36 100644 (file)
@@ -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;
        }