diff options
Diffstat (limited to 'drivers/ide/ide-io-std.c')
-rw-r--r-- | drivers/ide/ide-io-std.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/ide/ide-io-std.c b/drivers/ide/ide-io-std.c index bbeedce6b17d..31f5c5f4c093 100644 --- a/drivers/ide/ide-io-std.c +++ b/drivers/ide/ide-io-std.c | |||
@@ -159,8 +159,8 @@ void ide_tf_read(ide_drive_t *drive, struct ide_cmd *cmd) | |||
159 | /* be sure we're looking at the low order bits */ | 159 | /* be sure we're looking at the low order bits */ |
160 | tf_outb(ATA_DEVCTL_OBS, io_ports->ctl_addr); | 160 | tf_outb(ATA_DEVCTL_OBS, io_ports->ctl_addr); |
161 | 161 | ||
162 | if (cmd->tf_flags & IDE_TFLAG_IN_FEATURE) | 162 | if (cmd->tf_flags & IDE_TFLAG_IN_ERROR) |
163 | tf->feature = tf_inb(io_ports->feature_addr); | 163 | tf->error = tf_inb(io_ports->feature_addr); |
164 | if (cmd->tf_flags & IDE_TFLAG_IN_NSECT) | 164 | if (cmd->tf_flags & IDE_TFLAG_IN_NSECT) |
165 | tf->nsect = tf_inb(io_ports->nsect_addr); | 165 | tf->nsect = tf_inb(io_ports->nsect_addr); |
166 | if (cmd->tf_flags & IDE_TFLAG_IN_LBAL) | 166 | if (cmd->tf_flags & IDE_TFLAG_IN_LBAL) |
@@ -175,16 +175,16 @@ void ide_tf_read(ide_drive_t *drive, struct ide_cmd *cmd) | |||
175 | if (cmd->tf_flags & IDE_TFLAG_LBA48) { | 175 | if (cmd->tf_flags & IDE_TFLAG_LBA48) { |
176 | tf_outb(ATA_HOB | ATA_DEVCTL_OBS, io_ports->ctl_addr); | 176 | tf_outb(ATA_HOB | ATA_DEVCTL_OBS, io_ports->ctl_addr); |
177 | 177 | ||
178 | if (cmd->tf_flags & IDE_TFLAG_IN_HOB_FEATURE) | 178 | if (cmd->tf_flags & IDE_TFLAG_IN_HOB_ERROR) |
179 | tf->hob_feature = tf_inb(io_ports->feature_addr); | 179 | tf->hob_error = tf_inb(io_ports->feature_addr); |
180 | if (cmd->tf_flags & IDE_TFLAG_IN_HOB_NSECT) | 180 | if (cmd->tf_flags & IDE_TFLAG_IN_HOB_NSECT) |
181 | tf->hob_nsect = tf_inb(io_ports->nsect_addr); | 181 | tf->hob_nsect = tf_inb(io_ports->nsect_addr); |
182 | if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAL) | 182 | if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAL) |
183 | tf->hob_lbal = tf_inb(io_ports->lbal_addr); | 183 | tf->hob_lbal = tf_inb(io_ports->lbal_addr); |
184 | if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAM) | 184 | if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAM) |
185 | tf->hob_lbam = tf_inb(io_ports->lbam_addr); | 185 | tf->hob_lbam = tf_inb(io_ports->lbam_addr); |
186 | if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAH) | 186 | if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAH) |
187 | tf->hob_lbah = tf_inb(io_ports->lbah_addr); | 187 | tf->hob_lbah = tf_inb(io_ports->lbah_addr); |
188 | } | 188 | } |
189 | } | 189 | } |
190 | EXPORT_SYMBOL_GPL(ide_tf_read); | 190 | EXPORT_SYMBOL_GPL(ide_tf_read); |