aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-floppy.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-07-15 15:21:48 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-07-15 15:21:48 -0400
commit9a410e79b552bacb4481f85618aa7333b7776ed7 (patch)
tree9a6668d9edb84710c284185d6f860c4361df6ef6 /drivers/ide/ide-floppy.c
parente81a3bde13343bc36613aff8f864def7171b376a (diff)
ide: remove IDE_TFLAG_NO_SELECT_MASK taskfile flag
Always call SELECT_MASK(..., 0) in ide_tf_load() (needs to be done to match ide_set_irq(..., 1)) and then remove IDE_TFLAG_NO_SELECT_MASK taskfile flag. This change should only affect hpt366 and icside host drivers since ->maskproc(..., 0) for sgiioc4 is equivalent to ide_set_irq(..., 1). Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com> Cc: Russell King <rmk@arm.linux.org.uk> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-floppy.c')
-rw-r--r--drivers/ide/ide-floppy.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index 9161cd92a842..1852008d9ee4 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -667,8 +667,7 @@ static ide_startstop_t idefloppy_issue_pc(ide_drive_t *drive,
667 if ((pc->flags & PC_FLAG_DMA_RECOMMENDED) && drive->using_dma) 667 if ((pc->flags & PC_FLAG_DMA_RECOMMENDED) && drive->using_dma)
668 dma = !hwif->dma_ops->dma_setup(drive); 668 dma = !hwif->dma_ops->dma_setup(drive);
669 669
670 ide_pktcmd_tf_load(drive, IDE_TFLAG_NO_SELECT_MASK | 670 ide_pktcmd_tf_load(drive, IDE_TFLAG_OUT_DEVICE, bcount, dma);
671 IDE_TFLAG_OUT_DEVICE, bcount, dma);
672 671
673 if (dma) { 672 if (dma) {
674 /* Begin DMA, if necessary */ 673 /* Begin DMA, if necessary */