aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-h8300.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ide/ide-h8300.c')
-rw-r--r--drivers/ide/ide-h8300.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/drivers/ide/ide-h8300.c b/drivers/ide/ide-h8300.c
index 1d45cd5b6a1c..6cb1785d32e6 100644
--- a/drivers/ide/ide-h8300.c
+++ b/drivers/ide/ide-h8300.c
@@ -54,8 +54,11 @@ static void h8300_tf_load(ide_drive_t *drive, struct ide_cmd *cmd)
54 if (cmd->ftf_flags & IDE_FTFLAG_FLAGGED) 54 if (cmd->ftf_flags & IDE_FTFLAG_FLAGGED)
55 HIHI = 0xFF; 55 HIHI = 0xFF;
56 56
57 if (cmd->ftf_flags & IDE_FTFLAG_OUT_DATA) 57 if (cmd->ftf_flags & IDE_FTFLAG_OUT_DATA) {
58 mm_outw((tf->hob_data << 8) | tf->data, io_ports->data_addr); 58 u8 data[2] = { tf->data, tf->hob_data };
59
60 h8300_output_data(drive, cmd, data, 2);
61 }
59 62
60 if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_FEATURE) 63 if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_FEATURE)
61 outb(tf->hob_feature, io_ports->feature_addr); 64 outb(tf->hob_feature, io_ports->feature_addr);
@@ -91,10 +94,12 @@ static void h8300_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
91 struct ide_taskfile *tf = &cmd->tf; 94 struct ide_taskfile *tf = &cmd->tf;
92 95
93 if (cmd->ftf_flags & IDE_FTFLAG_IN_DATA) { 96 if (cmd->ftf_flags & IDE_FTFLAG_IN_DATA) {
94 u16 data = mm_inw(io_ports->data_addr); 97 u8 data[2];
98
99 h8300_input_data(drive, cmd, data, 2);
95 100
96 tf->data = data & 0xff; 101 tf->data = data[0];
97 tf->hob_data = (data >> 8) & 0xff; 102 tf->hob_data = data[1];
98 } 103 }
99 104
100 /* be sure we're looking at the low order bits */ 105 /* be sure we're looking at the low order bits */