]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ide: check drive->using_dma in flagged_taskfile()
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Fri, 19 Oct 2007 22:32:37 +0000 (00:32 +0200)
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Fri, 19 Oct 2007 22:32:37 +0000 (00:32 +0200)
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
drivers/ide/ide-taskfile.c

index 6812f4788789d5bfc66e6dca8cc71059fcea5967..73ef6bf5fbcc51470f6638f81766c63cd86b755d 100644 (file)
@@ -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);