diff options
author | Uwe Kleine-Koenig <ukl@pengutronix.de> | 2008-12-12 05:18:54 -0500 |
---|---|---|
committer | Uwe Kleine-Koenig <ukl@pengutronix.de> | 2008-12-12 05:18:54 -0500 |
commit | 7971db5a4b4176ad5df590fce07a962c643a2740 (patch) | |
tree | 6ad8e09c5376c4e4c532c3411b0171ba1011acd9 /drivers/ide/ide-io.c | |
parent | d403700bf8fc903584e830967f5d64075770848c (diff) | |
parent | c4edfced662fa64deeed89c7d8c9f96d86130c19 (diff) |
Merge branch 'for-rmk-misc' into for-rmk
Diffstat (limited to 'drivers/ide/ide-io.c')
-rw-r--r-- | drivers/ide/ide-io.c | 6 |
1 files changed, 4 insertions, 2 deletions
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 * | |||
208 | */ | 208 | */ |
209 | if (drive->hwif->dma_ops == NULL) | 209 | if (drive->hwif->dma_ops == NULL) |
210 | break; | 210 | break; |
211 | if (drive->dev_flags & IDE_DFLAG_USING_DMA) | 211 | /* |
212 | ide_set_dma(drive); | 212 | * TODO: respect IDE_DFLAG_USING_DMA |
213 | */ | ||
214 | ide_set_dma(drive); | ||
213 | break; | 215 | break; |
214 | } | 216 | } |
215 | 217 | ||