diff options
Diffstat (limited to 'drivers/ide/ide-floppy.c')
-rw-r--r-- | drivers/ide/ide-floppy.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c index a9f3127a74ed..dbefe35c1396 100644 --- a/drivers/ide/ide-floppy.c +++ b/drivers/ide/ide-floppy.c | |||
@@ -630,7 +630,7 @@ static ide_startstop_t idefloppy_issue_pc(ide_drive_t *drive, | |||
630 | } | 630 | } |
631 | dma = 0; | 631 | dma = 0; |
632 | 632 | ||
633 | if ((pc->flags & PC_FLAG_DMA_RECOMMENDED) && drive->using_dma) | 633 | if ((pc->flags & PC_FLAG_DMA_OK) && drive->using_dma) |
634 | dma = !hwif->dma_ops->dma_setup(drive); | 634 | dma = !hwif->dma_ops->dma_setup(drive); |
635 | 635 | ||
636 | ide_pktcmd_tf_load(drive, IDE_TFLAG_OUT_DEVICE, bcount, dma); | 636 | ide_pktcmd_tf_load(drive, IDE_TFLAG_OUT_DEVICE, bcount, dma); |
@@ -755,7 +755,7 @@ static void idefloppy_create_rw_cmd(idefloppy_floppy_t *floppy, | |||
755 | pc->flags |= PC_FLAG_WRITING; | 755 | pc->flags |= PC_FLAG_WRITING; |
756 | pc->buf = NULL; | 756 | pc->buf = NULL; |
757 | pc->req_xfer = pc->buf_size = blocks * floppy->block_size; | 757 | pc->req_xfer = pc->buf_size = blocks * floppy->block_size; |
758 | pc->flags |= PC_FLAG_DMA_RECOMMENDED; | 758 | pc->flags |= PC_FLAG_DMA_OK; |
759 | } | 759 | } |
760 | 760 | ||
761 | static void idefloppy_blockpc_cmd(idefloppy_floppy_t *floppy, | 761 | static void idefloppy_blockpc_cmd(idefloppy_floppy_t *floppy, |
@@ -769,7 +769,7 @@ static void idefloppy_blockpc_cmd(idefloppy_floppy_t *floppy, | |||
769 | pc->flags |= PC_FLAG_WRITING; | 769 | pc->flags |= PC_FLAG_WRITING; |
770 | pc->buf = rq->data; | 770 | pc->buf = rq->data; |
771 | if (rq->bio) | 771 | if (rq->bio) |
772 | pc->flags |= PC_FLAG_DMA_RECOMMENDED; | 772 | pc->flags |= PC_FLAG_DMA_OK; |
773 | /* | 773 | /* |
774 | * possibly problematic, doesn't look like ide-floppy correctly | 774 | * possibly problematic, doesn't look like ide-floppy correctly |
775 | * handled scattered requests if dma fails... | 775 | * handled scattered requests if dma fails... |