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

Commit 04d09b0e authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: set IDE_TFLAG_WRITE basing on data phase used in ide_taskfile_ioctl() 



Also take care of fixing up incorrect TASKFILE_IN_DMA[Q] data phase when
IDE_DRIVE_TASK_RAW_WRITE is requested (no need to do it for TASKFILE_NO_DATA
and TASKFILE_[MULTI]_IN -- it had no chance of working previously).

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent b6308ee0

drivers/ide/ide-taskfile.c

+9 −4
Original line number Diff line number Diff line
@@ -586,7 +586,14 @@ int ide_taskfile_ioctl(ide_drive_t *drive, unsigned long arg) 
	if (req_task->in_flags.b.data)

		cmd.ftf_flags |= IDE_FTFLAG_IN_DATA;



	switch(req_task->data_phase) {

	if (req_task->req_cmd == IDE_DRIVE_TASK_RAW_WRITE) {

		/* fixup data phase if needed */

		if (req_task->data_phase == TASKFILE_IN_DMAQ ||

		    req_task->data_phase == TASKFILE_IN_DMA)

			cmd.data_phase = TASKFILE_OUT_DMA;

	}



	switch (cmd.data_phase) {

		case TASKFILE_MULTI_OUT:

			if (!drive->mult_count) {

				/* (hs): give up if multcount is not set */
@@ -601,6 +608,7 @@ int ide_taskfile_ioctl(ide_drive_t *drive, unsigned long arg) 
			/* fall through */

		case TASKFILE_OUT_DMAQ:

		case TASKFILE_OUT_DMA:

			cmd.tf_flags |= IDE_TFLAG_WRITE;

			nsect = taskout / SECTOR_SIZE;

			data_buf = outbuf;

			break;
@@ -641,9 +649,6 @@ int ide_taskfile_ioctl(ide_drive_t *drive, unsigned long arg) 
		}

	}



	if (req_task->req_cmd == IDE_DRIVE_TASK_RAW_WRITE)

		cmd.tf_flags |= IDE_TFLAG_WRITE;



	err = ide_raw_taskfile(drive, &cmd, data_buf, nsect);



	memcpy(req_task->hob_ports, &cmd.tf_array[0],