diff options
Diffstat (limited to 'drivers/ide/scc_pata.c')
-rw-r--r-- | drivers/ide/scc_pata.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/ide/scc_pata.c b/drivers/ide/scc_pata.c index 1238d5561976..f5a6fa0a8bea 100644 --- a/drivers/ide/scc_pata.c +++ b/drivers/ide/scc_pata.c | |||
@@ -650,10 +650,6 @@ static void scc_tf_load(ide_drive_t *drive, struct ide_cmd *cmd) | |||
650 | struct ide_io_ports *io_ports = &drive->hwif->io_ports; | 650 | struct ide_io_ports *io_ports = &drive->hwif->io_ports; |
651 | struct ide_taskfile *tf = &cmd->hob; | 651 | struct ide_taskfile *tf = &cmd->hob; |
652 | u8 valid = cmd->valid.out.hob; | 652 | u8 valid = cmd->valid.out.hob; |
653 | u8 HIHI = (cmd->tf_flags & IDE_TFLAG_LBA48) ? 0xE0 : 0xEF; | ||
654 | |||
655 | if (cmd->ftf_flags & IDE_FTFLAG_FLAGGED) | ||
656 | HIHI = 0xFF; | ||
657 | 653 | ||
658 | if (valid & IDE_VALID_FEATURE) | 654 | if (valid & IDE_VALID_FEATURE) |
659 | scc_ide_outb(tf->feature, io_ports->feature_addr); | 655 | scc_ide_outb(tf->feature, io_ports->feature_addr); |
@@ -679,10 +675,8 @@ static void scc_tf_load(ide_drive_t *drive, struct ide_cmd *cmd) | |||
679 | scc_ide_outb(tf->lbam, io_ports->lbam_addr); | 675 | scc_ide_outb(tf->lbam, io_ports->lbam_addr); |
680 | if (valid & IDE_VALID_LBAH) | 676 | if (valid & IDE_VALID_LBAH) |
681 | scc_ide_outb(tf->lbah, io_ports->lbah_addr); | 677 | scc_ide_outb(tf->lbah, io_ports->lbah_addr); |
682 | |||
683 | if (valid & IDE_VALID_DEVICE) | 678 | if (valid & IDE_VALID_DEVICE) |
684 | scc_ide_outb((tf->device & HIHI) | drive->select, | 679 | scc_ide_outb(tf->device, io_ports->device_addr); |
685 | io_ports->device_addr); | ||
686 | } | 680 | } |
687 | 681 | ||
688 | static void scc_tf_read(ide_drive_t *drive, struct ide_cmd *cmd) | 682 | static void scc_tf_read(ide_drive_t *drive, struct ide_cmd *cmd) |