---

yaml --- r: 56436 b: refs/heads/master c: 793a972 h: refs/heads/master v: v3
git-mirror · May 15, 2007 · 912f541 · 912f541
1 parent 4572cc8
commit 912f541
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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
-Original file line number
+Diff line change
@@ Expand Up @@
     			break;
     		if (drive->hwif->ide_dma_check == NULL)
     			break;
+    		drive->hwif->dma_off_quietly(drive);
     		ide_set_dma(drive);
     		break;
     	}
@@ Expand Down @@