Signed-off-by: Andrew Morton --- drivers/ide/ide-floppy.c | 2 +- drivers/ide/ide-tape.c | 2 +- drivers/scsi/ide-scsi.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff -puN drivers/ide/ide-floppy.c~ide-mm-ide-floppy-tape-scsi-fix-register-loading-order-when-issuing-packet-command drivers/ide/ide-floppy.c --- a/drivers/ide/ide-floppy.c~ide-mm-ide-floppy-tape-scsi-fix-register-loading-order-when-issuing-packet-command +++ a/drivers/ide/ide-floppy.c @@ -1071,8 +1071,8 @@ static ide_startstop_t idefloppy_issue_p HWIF(drive)->OUTB(drive->ctl, IDE_CONTROL_REG); /* Use PIO/DMA */ hwif->OUTB(dma, IDE_FEATURE_REG); - hwif->OUTB((bcount >> 8) & 0xff, IDE_BCOUNTH_REG); hwif->OUTB(bcount & 0xff, IDE_BCOUNTL_REG); + hwif->OUTB((bcount >> 8) & 0xff, IDE_BCOUNTH_REG); HWIF(drive)->OUTB(drive->select.all, IDE_SELECT_REG); if (dma) { /* Begin DMA, if necessary */ diff -puN drivers/ide/ide-tape.c~ide-mm-ide-floppy-tape-scsi-fix-register-loading-order-when-issuing-packet-command drivers/ide/ide-tape.c --- a/drivers/ide/ide-tape.c~ide-mm-ide-floppy-tape-scsi-fix-register-loading-order-when-issuing-packet-command +++ a/drivers/ide/ide-tape.c @@ -2174,8 +2174,8 @@ static ide_startstop_t idetape_issue_pac if (IDE_CONTROL_REG) hwif->OUTB(drive->ctl, IDE_CONTROL_REG); hwif->OUTB(dma_ok ? 1 : 0, IDE_FEATURE_REG); /* Use PIO/DMA */ - hwif->OUTB((bcount >> 8) & 0xff, IDE_BCOUNTH_REG); hwif->OUTB(bcount & 0xff, IDE_BCOUNTL_REG); + hwif->OUTB((bcount >> 8) & 0xff, IDE_BCOUNTH_REG); hwif->OUTB(drive->select.all, IDE_SELECT_REG); if (dma_ok) /* Will begin DMA later */ set_bit(PC_DMA_IN_PROGRESS, &pc->flags); diff -puN drivers/scsi/ide-scsi.c~ide-mm-ide-floppy-tape-scsi-fix-register-loading-order-when-issuing-packet-command drivers/scsi/ide-scsi.c --- a/drivers/scsi/ide-scsi.c~ide-mm-ide-floppy-tape-scsi-fix-register-loading-order-when-issuing-packet-command +++ a/drivers/scsi/ide-scsi.c @@ -594,8 +594,8 @@ static ide_startstop_t idescsi_issue_pc HWIF(drive)->OUTB(drive->ctl, IDE_CONTROL_REG); hwif->OUTB(dma, IDE_FEATURE_REG); - hwif->OUTB((bcount >> 8) & 0xff, IDE_BCOUNTH_REG); hwif->OUTB(bcount & 0xff, IDE_BCOUNTL_REG); + hwif->OUTB((bcount >> 8) & 0xff, IDE_BCOUNTH_REG); if (dma) set_bit(PC_DMA_OK, &pc->flags); _