---

yaml --- r: 71784 b: refs/heads/master c: eda5b35 h: refs/heads/master v: v3
git-mirror · Oct 19, 2007 · c6433db · c6433db
1 parent 89b4965
commit c6433db
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dd35b7bb86c1ae6adddf68db71481144941246d1
+refs/heads/master: eda5b359dc8372424eed94f5a3e27c2deb4e76cf
diff --git a/trunk/drivers/ide/ide-taskfile.c b/trunk/drivers/ide/ide-taskfile.c
@@ -837,6 +837,9 @@ ide_startstop_t flagged_taskfile (ide_drive_t *drive, ide_task_t *task)
 		case TASKFILE_OUT_DMA:
 		case TASKFILE_IN_DMAQ:
 		case TASKFILE_IN_DMA:
+			if (!drive->using_dma)
+				break;
+
 			if (!hwif->dma_setup(drive)) {
 				hwif->dma_exec_cmd(drive, taskfile->command);
 				hwif->dma_start(drive);