From 912f5410a1c5a1c7011ab41ee35a965be6ed572a Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Wed, 16 May 2007 00:51:43 +0200 Subject: [PATCH] --- yaml --- r: 56436 b: refs/heads/master c: 793a97228d3da876f42b7fb4d4a52cc8cc86dc81 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/ide/ide-io.c | 1 + trunk/drivers/ide/ide.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index e4eb3f1dc9e1..bbd6bc2b3cd3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7f86723a60d287be19aee620277184f9f5455283 +refs/heads/master: 793a97228d3da876f42b7fb4d4a52cc8cc86dc81 diff --git a/trunk/drivers/ide/ide-io.c b/trunk/drivers/ide/ide-io.c index 8e568143d90d..bfe8f1b712ba 100644 --- a/trunk/drivers/ide/ide-io.c +++ b/trunk/drivers/ide/ide-io.c @@ -223,6 +223,7 @@ static ide_startstop_t ide_start_power_step(ide_drive_t *drive, struct request * break; if (drive->hwif->ide_dma_check == NULL) break; + drive->hwif->dma_off_quietly(drive); ide_set_dma(drive); break; } diff --git a/trunk/drivers/ide/ide.c b/trunk/drivers/ide/ide.c index f2b547ff7722..6002713a20a1 100644 --- a/trunk/drivers/ide/ide.c +++ b/trunk/drivers/ide/ide.c @@ -910,6 +910,7 @@ int set_using_dma(ide_drive_t *drive, int arg) err = 0; if (arg) { + hwif->dma_off_quietly(drive); if (ide_set_dma(drive) || hwif->ide_dma_on(drive)) err = -EIO; } else