diff options
Diffstat (limited to 'drivers/ide/tx4938ide.c')
-rw-r--r-- | drivers/ide/tx4938ide.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/ide/tx4938ide.c b/drivers/ide/tx4938ide.c index 606c37f5267d..c075464308a0 100644 --- a/drivers/ide/tx4938ide.c +++ b/drivers/ide/tx4938ide.c | |||
@@ -93,10 +93,9 @@ static void tx4938ide_tf_load(ide_drive_t *drive, struct ide_cmd *cmd) | |||
93 | HIHI = 0xFF; | 93 | HIHI = 0xFF; |
94 | 94 | ||
95 | if (cmd->ftf_flags & IDE_FTFLAG_OUT_DATA) { | 95 | if (cmd->ftf_flags & IDE_FTFLAG_OUT_DATA) { |
96 | u16 data = (tf->hob_data << 8) | tf->data; | 96 | u8 data[2] = { tf->data, tf->hob_data }; |
97 | 97 | ||
98 | /* no endian swap */ | 98 | hwif->tp_ops->output_data(drive, cmd, data, 2); |
99 | __raw_writew(data, (void __iomem *)io_ports->data_addr); | ||
100 | } | 99 | } |
101 | 100 | ||
102 | if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_FEATURE) | 101 | if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_FEATURE) |
@@ -133,12 +132,12 @@ static void tx4938ide_tf_read(ide_drive_t *drive, struct ide_cmd *cmd) | |||
133 | struct ide_taskfile *tf = &cmd->tf; | 132 | struct ide_taskfile *tf = &cmd->tf; |
134 | 133 | ||
135 | if (cmd->ftf_flags & IDE_FTFLAG_IN_DATA) { | 134 | if (cmd->ftf_flags & IDE_FTFLAG_IN_DATA) { |
136 | u16 data; | 135 | u8 data[2]; |
137 | 136 | ||
138 | /* no endian swap */ | 137 | hwif->tp_ops->input_data(drive, cmd, data, 2); |
139 | data = __raw_readw((void __iomem *)io_ports->data_addr); | 138 | |
140 | tf->data = data & 0xff; | 139 | tf->data = data[0]; |
141 | tf->hob_data = (data >> 8) & 0xff; | 140 | tf->hob_data = data[1]; |
142 | } | 141 | } |
143 | 142 | ||
144 | /* be sure we're looking at the low order bits */ | 143 | /* be sure we're looking at the low order bits */ |