From c6433db4cd784d6cdd940b611bc859f8f52a3799 Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Sat, 20 Oct 2007 00:32:37 +0200
Subject: [PATCH] --- yaml --- r: 71784 b: refs/heads/master c:
 eda5b359dc8372424eed94f5a3e27c2deb4e76cf h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/ide/ide-taskfile.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 73da3f8abe46..90ca014315bc 100644
--- 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
index 6812f4788789..73ef6bf5fbcc 100644
--- 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);