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: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index 249a707f88a47f9e5c3dd08442a04afe5e132b7d..647216c772d99498c9d5db3ac2b2fe6616c5d4cd 100644 (file)
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -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],