diff options
Diffstat (limited to 'drivers/ide/ide-floppy.c')
| -rw-r--r-- | drivers/ide/ide-floppy.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c index d4fd064cc76c..ff8232ef9659 100644 --- a/drivers/ide/ide-floppy.c +++ b/drivers/ide/ide-floppy.c | |||
| @@ -1067,13 +1067,8 @@ static ide_startstop_t idefloppy_issue_pc (ide_drive_t *drive, idefloppy_pc_t *p | |||
| 1067 | if (test_bit(PC_DMA_RECOMMENDED, &pc->flags) && drive->using_dma) | 1067 | if (test_bit(PC_DMA_RECOMMENDED, &pc->flags) && drive->using_dma) |
| 1068 | dma = !hwif->dma_setup(drive); | 1068 | dma = !hwif->dma_setup(drive); |
| 1069 | 1069 | ||
| 1070 | if (IDE_CONTROL_REG) | 1070 | ide_pktcmd_tf_load(drive, IDE_TFLAG_NO_SELECT_MASK | |
| 1071 | HWIF(drive)->OUTB(drive->ctl, IDE_CONTROL_REG); | 1071 | IDE_TFLAG_OUT_DEVICE, bcount, dma); |
| 1072 | /* Use PIO/DMA */ | ||
| 1073 | hwif->OUTB(dma, IDE_FEATURE_REG); | ||
| 1074 | hwif->OUTB(bcount & 0xff, IDE_BCOUNTL_REG); | ||
| 1075 | hwif->OUTB((bcount >> 8) & 0xff, IDE_BCOUNTH_REG); | ||
| 1076 | HWIF(drive)->OUTB(drive->select.all, IDE_SELECT_REG); | ||
| 1077 | 1072 | ||
| 1078 | if (dma) { /* Begin DMA, if necessary */ | 1073 | if (dma) { /* Begin DMA, if necessary */ |
| 1079 | set_bit(PC_DMA_IN_PROGRESS, &pc->flags); | 1074 | set_bit(PC_DMA_IN_PROGRESS, &pc->flags); |
