diff options
Diffstat (limited to 'drivers/ide/tx4939ide.c')
-rw-r--r-- | drivers/ide/tx4939ide.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/drivers/ide/tx4939ide.c b/drivers/ide/tx4939ide.c index 43bc0372413a..f1e9da71110c 100644 --- a/drivers/ide/tx4939ide.c +++ b/drivers/ide/tx4939ide.c | |||
@@ -511,8 +511,8 @@ static void tx4939ide_tf_read(ide_drive_t *drive, struct ide_cmd *cmd) | |||
511 | /* be sure we're looking at the low order bits */ | 511 | /* be sure we're looking at the low order bits */ |
512 | tx4939ide_outb(ATA_DEVCTL_OBS, io_ports->ctl_addr); | 512 | tx4939ide_outb(ATA_DEVCTL_OBS, io_ports->ctl_addr); |
513 | 513 | ||
514 | if (cmd->tf_flags & IDE_TFLAG_IN_FEATURE) | 514 | if (cmd->tf_flags & IDE_TFLAG_IN_ERROR) |
515 | tf->feature = tx4939ide_inb(io_ports->feature_addr); | 515 | tf->error = tx4939ide_inb(io_ports->feature_addr); |
516 | if (cmd->tf_flags & IDE_TFLAG_IN_NSECT) | 516 | if (cmd->tf_flags & IDE_TFLAG_IN_NSECT) |
517 | tf->nsect = tx4939ide_inb(io_ports->nsect_addr); | 517 | tf->nsect = tx4939ide_inb(io_ports->nsect_addr); |
518 | if (cmd->tf_flags & IDE_TFLAG_IN_LBAL) | 518 | if (cmd->tf_flags & IDE_TFLAG_IN_LBAL) |
@@ -527,17 +527,16 @@ static void tx4939ide_tf_read(ide_drive_t *drive, struct ide_cmd *cmd) | |||
527 | if (cmd->tf_flags & IDE_TFLAG_LBA48) { | 527 | if (cmd->tf_flags & IDE_TFLAG_LBA48) { |
528 | tx4939ide_outb(ATA_HOB | ATA_DEVCTL_OBS, io_ports->ctl_addr); | 528 | tx4939ide_outb(ATA_HOB | ATA_DEVCTL_OBS, io_ports->ctl_addr); |
529 | 529 | ||
530 | if (cmd->tf_flags & IDE_TFLAG_IN_HOB_FEATURE) | 530 | if (cmd->tf_flags & IDE_TFLAG_IN_HOB_ERROR) |
531 | tf->hob_feature = | 531 | tf->hob_error = tx4939ide_inb(io_ports->feature_addr); |
532 | tx4939ide_inb(io_ports->feature_addr); | ||
533 | if (cmd->tf_flags & IDE_TFLAG_IN_HOB_NSECT) | 532 | if (cmd->tf_flags & IDE_TFLAG_IN_HOB_NSECT) |
534 | tf->hob_nsect = tx4939ide_inb(io_ports->nsect_addr); | 533 | tf->hob_nsect = tx4939ide_inb(io_ports->nsect_addr); |
535 | if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAL) | 534 | if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAL) |
536 | tf->hob_lbal = tx4939ide_inb(io_ports->lbal_addr); | 535 | tf->hob_lbal = tx4939ide_inb(io_ports->lbal_addr); |
537 | if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAM) | 536 | if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAM) |
538 | tf->hob_lbam = tx4939ide_inb(io_ports->lbam_addr); | 537 | tf->hob_lbam = tx4939ide_inb(io_ports->lbam_addr); |
539 | if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAH) | 538 | if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAH) |
540 | tf->hob_lbah = tx4939ide_inb(io_ports->lbah_addr); | 539 | tf->hob_lbah = tx4939ide_inb(io_ports->lbah_addr); |
541 | } | 540 | } |
542 | } | 541 | } |
543 | 542 | ||