ide: move data register access out of tf_{read|load}() methods (take 2)

Move IDE_FTFLAG_{IN|OUT}_DATA flag handling out of tf_{read|load}() methods
into the only two functions where these flags actually need to be handled:
do_rw_taskfile() and ide_complete_cmd()...

Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 6 insertions, 0 deletions

diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index 47f13cd11031..243421ce40d0 100644
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -82,6 +82,12 @@ ide_startstop_t do_rw_taskfile(ide_drive_t *drive, struct ide_cmd *orig_cmd)
                 ide_tf_dump(drive->name, tf);
                 tp_ops->write_devctl(hwif, ATA_DEVCTL_OBS);
                 SELECT_MASK(drive, 0);
+
+                if (cmd->ftf_flags & IDE_FTFLAG_OUT_DATA) {
+                        u8 data[2] = { tf->data, tf->hob_data };
+
+                        tp_ops->output_data(drive, cmd, data, 2);
+                }
                 tp_ops->tf_load(drive, cmd);
         }