diff options
Diffstat (limited to 'drivers/ide/tx4938ide.c')
-rw-r--r-- | drivers/ide/tx4938ide.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/drivers/ide/tx4938ide.c b/drivers/ide/tx4938ide.c index ec3aa32fbbe0..606c37f5267d 100644 --- a/drivers/ide/tx4938ide.c +++ b/drivers/ide/tx4938ide.c | |||
@@ -144,8 +144,8 @@ static void tx4938ide_tf_read(ide_drive_t *drive, struct ide_cmd *cmd) | |||
144 | /* be sure we're looking at the low order bits */ | 144 | /* be sure we're looking at the low order bits */ |
145 | tx4938ide_outb(ATA_DEVCTL_OBS, io_ports->ctl_addr); | 145 | tx4938ide_outb(ATA_DEVCTL_OBS, io_ports->ctl_addr); |
146 | 146 | ||
147 | if (cmd->tf_flags & IDE_TFLAG_IN_FEATURE) | 147 | if (cmd->tf_flags & IDE_TFLAG_IN_ERROR) |
148 | tf->feature = tx4938ide_inb(io_ports->feature_addr); | 148 | tf->error = tx4938ide_inb(io_ports->feature_addr); |
149 | if (cmd->tf_flags & IDE_TFLAG_IN_NSECT) | 149 | if (cmd->tf_flags & IDE_TFLAG_IN_NSECT) |
150 | tf->nsect = tx4938ide_inb(io_ports->nsect_addr); | 150 | tf->nsect = tx4938ide_inb(io_ports->nsect_addr); |
151 | if (cmd->tf_flags & IDE_TFLAG_IN_LBAL) | 151 | if (cmd->tf_flags & IDE_TFLAG_IN_LBAL) |
@@ -160,17 +160,16 @@ static void tx4938ide_tf_read(ide_drive_t *drive, struct ide_cmd *cmd) | |||
160 | if (cmd->tf_flags & IDE_TFLAG_LBA48) { | 160 | if (cmd->tf_flags & IDE_TFLAG_LBA48) { |
161 | tx4938ide_outb(ATA_HOB | ATA_DEVCTL_OBS, io_ports->ctl_addr); | 161 | tx4938ide_outb(ATA_HOB | ATA_DEVCTL_OBS, io_ports->ctl_addr); |
162 | 162 | ||
163 | if (cmd->tf_flags & IDE_TFLAG_IN_HOB_FEATURE) | 163 | if (cmd->tf_flags & IDE_TFLAG_IN_HOB_ERROR) |
164 | tf->hob_feature = | 164 | tf->hob_error = tx4938ide_inb(io_ports->feature_addr); |
165 | tx4938ide_inb(io_ports->feature_addr); | ||
166 | if (cmd->tf_flags & IDE_TFLAG_IN_HOB_NSECT) | 165 | if (cmd->tf_flags & IDE_TFLAG_IN_HOB_NSECT) |
167 | tf->hob_nsect = tx4938ide_inb(io_ports->nsect_addr); | 166 | tf->hob_nsect = tx4938ide_inb(io_ports->nsect_addr); |
168 | if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAL) | 167 | if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAL) |
169 | tf->hob_lbal = tx4938ide_inb(io_ports->lbal_addr); | 168 | tf->hob_lbal = tx4938ide_inb(io_ports->lbal_addr); |
170 | if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAM) | 169 | if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAM) |
171 | tf->hob_lbam = tx4938ide_inb(io_ports->lbam_addr); | 170 | tf->hob_lbam = tx4938ide_inb(io_ports->lbam_addr); |
172 | if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAH) | 171 | if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAH) |
173 | tf->hob_lbah = tx4938ide_inb(io_ports->lbah_addr); | 172 | tf->hob_lbah = tx4938ide_inb(io_ports->lbah_addr); |
174 | } | 173 | } |
175 | } | 174 | } |
176 | 175 | ||