Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd35b7bb authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

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



Acked-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent d3bad45f

drivers/ide/ide-taskfile.c

+7 −4
Original line number Diff line number Diff line
@@ -837,9 +837,11 @@ 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:

			hwif->dma_setup(drive);

			if (!hwif->dma_setup(drive)) {

				hwif->dma_exec_cmd(drive, taskfile->command);

				hwif->dma_start(drive);

				return ide_started;

			}

			break;



	        default:
@@ -853,7 +855,8 @@ ide_startstop_t flagged_taskfile (ide_drive_t *drive, ide_task_t *task) 
				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;

}