aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2007-10-20 00:32:37 +0200
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2007-10-20 00:32:37 +0200
commiteda5b359dc8372424eed94f5a3e27c2deb4e76cf (patch)
treefced40520225fa475e05738e079be1b86e6fbd79
parentide: check ->dma_setup() return value in flagged_taskfile() (diff)
downloadlinux-dev-eda5b359dc8372424eed94f5a3e27c2deb4e76cf.tar.xz
linux-dev-eda5b359dc8372424eed94f5a3e27c2deb4e76cf.zip
ide: check drive->using_dma in flagged_taskfile()
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
-rw-r--r--drivers/ide/ide-taskfile.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index 6812f4788789..73ef6bf5fbcc 100644
--- a/drivers/ide/ide-taskfile.c
+++ b/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);