Skip to contentSkip to conversation

ide: check ->dma_setup() return value in flagged_taskfile()

PATCH In review Bartlomiej Zolnierkiewicz 2 participants 2 messages Oct 8, 2007 – Oct 9, 2007 libata

lore
Share & tools
lore

Bartlomiej Zolnierkiewicz

author
#0 lore raw

PATCH 1/12 ide: check ->dma_setup() return value in flagged_taskfile()

Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
---
 drivers/ide/ide-taskfile.c |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/ide/ide-taskfile.c +7 -4
Index: b/drivers/ide/ide-taskfile.c
===================================================================
@@ -827,9 +827,11 @@ ide_startstop_t flagged_taskfile (ide_dr
 		case TASKFILE_OUT_DMA:
 		case TASKFILE_IN_DMAQ:
 		case TASKFILE_IN_DMA:
-			hwif->dma_setup(drive);
-			hwif->dma_exec_cmd(drive, taskfile->command);
-			hwif->dma_start(drive);
+			if (!hwif->dma_setup(drive)) {
+				hwif->dma_exec_cmd(drive, taskfile->command);
+				hwif->dma_start(drive);
+				return ide_started;
+			}
 			break;
 
 	        default:

@@ -843,7 +845,8 @@ ide_startstop_t flagged_taskfile (ide_dr
 				return task->prehandler(drive, task->rq);
 			}
 			ide_execute_command(drive, taskfile->command, task->handler, WAIT_WORSTCASE, NULL);
+			return ide_started;
 	}
 
-	return ide_started;
+	return ide_stopped;
 }