diff options
Diffstat (limited to 'drivers/ide/ide-floppy.c')
-rw-r--r-- | drivers/ide/ide-floppy.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c index 61969415c57b..57cd21c5b2c1 100644 --- a/drivers/ide/ide-floppy.c +++ b/drivers/ide/ide-floppy.c | |||
@@ -867,7 +867,7 @@ static ide_startstop_t idefloppy_pc_intr (ide_drive_t *drive) | |||
867 | if (test_and_clear_bit(PC_DMA_IN_PROGRESS, &pc->flags)) { | 867 | if (test_and_clear_bit(PC_DMA_IN_PROGRESS, &pc->flags)) { |
868 | printk(KERN_ERR "ide-floppy: The floppy wants to issue " | 868 | printk(KERN_ERR "ide-floppy: The floppy wants to issue " |
869 | "more interrupts in DMA mode\n"); | 869 | "more interrupts in DMA mode\n"); |
870 | (void)__ide_dma_off(drive); | 870 | ide_dma_off(drive); |
871 | return ide_do_reset(drive); | 871 | return ide_do_reset(drive); |
872 | } | 872 | } |
873 | 873 | ||
@@ -1097,9 +1097,9 @@ static ide_startstop_t idefloppy_issue_pc (ide_drive_t *drive, idefloppy_pc_t *p | |||
1097 | pc->current_position = pc->buffer; | 1097 | pc->current_position = pc->buffer; |
1098 | bcount.all = min(pc->request_transfer, 63 * 1024); | 1098 | bcount.all = min(pc->request_transfer, 63 * 1024); |
1099 | 1099 | ||
1100 | if (test_and_clear_bit(PC_DMA_ERROR, &pc->flags)) { | 1100 | if (test_and_clear_bit(PC_DMA_ERROR, &pc->flags)) |
1101 | (void)__ide_dma_off(drive); | 1101 | ide_dma_off(drive); |
1102 | } | 1102 | |
1103 | feature.all = 0; | 1103 | feature.all = 0; |
1104 | 1104 | ||
1105 | if (test_bit(PC_DMA_RECOMMENDED, &pc->flags) && drive->using_dma) | 1105 | if (test_bit(PC_DMA_RECOMMENDED, &pc->flags) && drive->using_dma) |