diff options
Diffstat (limited to 'drivers/ide/scc_pata.c')
| -rw-r--r-- | drivers/ide/scc_pata.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/ide/scc_pata.c b/drivers/ide/scc_pata.c index 6ba4983d831c..ea0a9752c6f9 100644 --- a/drivers/ide/scc_pata.c +++ b/drivers/ide/scc_pata.c | |||
| @@ -702,8 +702,8 @@ static void scc_tf_read(ide_drive_t *drive, struct ide_cmd *cmd) | |||
| 702 | /* be sure we're looking at the low order bits */ | 702 | /* be sure we're looking at the low order bits */ |
| 703 | scc_ide_outb(ATA_DEVCTL_OBS, io_ports->ctl_addr); | 703 | scc_ide_outb(ATA_DEVCTL_OBS, io_ports->ctl_addr); |
| 704 | 704 | ||
| 705 | if (cmd->tf_flags & IDE_TFLAG_IN_FEATURE) | 705 | if (cmd->tf_flags & IDE_TFLAG_IN_ERROR) |
| 706 | tf->feature = scc_ide_inb(io_ports->feature_addr); | 706 | tf->error = scc_ide_inb(io_ports->feature_addr); |
| 707 | if (cmd->tf_flags & IDE_TFLAG_IN_NSECT) | 707 | if (cmd->tf_flags & IDE_TFLAG_IN_NSECT) |
| 708 | tf->nsect = scc_ide_inb(io_ports->nsect_addr); | 708 | tf->nsect = scc_ide_inb(io_ports->nsect_addr); |
| 709 | if (cmd->tf_flags & IDE_TFLAG_IN_LBAL) | 709 | if (cmd->tf_flags & IDE_TFLAG_IN_LBAL) |
| @@ -718,16 +718,16 @@ static void scc_tf_read(ide_drive_t *drive, struct ide_cmd *cmd) | |||
| 718 | if (cmd->tf_flags & IDE_TFLAG_LBA48) { | 718 | if (cmd->tf_flags & IDE_TFLAG_LBA48) { |
| 719 | scc_ide_outb(ATA_HOB | ATA_DEVCTL_OBS, io_ports->ctl_addr); | 719 | scc_ide_outb(ATA_HOB | ATA_DEVCTL_OBS, io_ports->ctl_addr); |
| 720 | 720 | ||
| 721 | if (cmd->tf_flags & IDE_TFLAG_IN_HOB_FEATURE) | 721 | if (cmd->tf_flags & IDE_TFLAG_IN_HOB_ERROR) |
| 722 | tf->hob_feature = scc_ide_inb(io_ports->feature_addr); | 722 | tf->hob_error = scc_ide_inb(io_ports->feature_addr); |
| 723 | if (cmd->tf_flags & IDE_TFLAG_IN_HOB_NSECT) | 723 | if (cmd->tf_flags & IDE_TFLAG_IN_HOB_NSECT) |
| 724 | tf->hob_nsect = scc_ide_inb(io_ports->nsect_addr); | 724 | tf->hob_nsect = scc_ide_inb(io_ports->nsect_addr); |
| 725 | if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAL) | 725 | if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAL) |
| 726 | tf->hob_lbal = scc_ide_inb(io_ports->lbal_addr); | 726 | tf->hob_lbal = scc_ide_inb(io_ports->lbal_addr); |
| 727 | if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAM) | 727 | if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAM) |
| 728 | tf->hob_lbam = scc_ide_inb(io_ports->lbam_addr); | 728 | tf->hob_lbam = scc_ide_inb(io_ports->lbam_addr); |
| 729 | if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAH) | 729 | if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAH) |
| 730 | tf->hob_lbah = scc_ide_inb(io_ports->lbah_addr); | 730 | tf->hob_lbah = scc_ide_inb(io_ports->lbah_addr); |
| 731 | } | 731 | } |
| 732 | } | 732 | } |
| 733 | 733 | ||