aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/NCR5380.c
diff options
context:
space:
mode:
authorRoel Kluin <roel.kluin@gmail.com>2010-08-10 21:01:11 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-11 11:59:00 -0400
commit085267acd0ca29623c8239a38639d43d6d21e972 (patch)
tree0f9f1b3fe7e33ec6bae67d403f9e085c92bb0075 /drivers/scsi/NCR5380.c
parent2c076eea6d3005c54f6e7be5938477fdc7027686 (diff)
NCR5380: bit MR_DMA_MODE set twice in NCR5380_transfer_dma()
Besides keeping the line short, the second setting of the MR_DMA_MODE bit was removed. Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Cc: James Bottomley <James.Bottomley@HansenPartnership.com> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/scsi/NCR5380.c')
-rw-r--r--drivers/scsi/NCR5380.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c
index f92da9fd5f20..5d2f148889ad 100644
--- a/drivers/scsi/NCR5380.c
+++ b/drivers/scsi/NCR5380.c
@@ -1857,7 +1857,9 @@ static int NCR5380_transfer_dma(struct Scsi_Host *instance, unsigned char *phase
1857#endif 1857#endif
1858 /* KLL May need eop and parity in 53c400 */ 1858 /* KLL May need eop and parity in 53c400 */
1859 if (hostdata->flags & FLAG_NCR53C400) 1859 if (hostdata->flags & FLAG_NCR53C400)
1860 NCR5380_write(MODE_REG, MR_BASE | MR_DMA_MODE | MR_ENABLE_PAR_CHECK | MR_ENABLE_PAR_INTR | MR_ENABLE_EOP_INTR | MR_DMA_MODE | MR_MONITOR_BSY); 1860 NCR5380_write(MODE_REG, MR_BASE | MR_DMA_MODE |
1861 MR_ENABLE_PAR_CHECK | MR_ENABLE_PAR_INTR |
1862 MR_ENABLE_EOP_INTR | MR_MONITOR_BSY);
1861 else 1863 else
1862 NCR5380_write(MODE_REG, MR_BASE | MR_DMA_MODE); 1864 NCR5380_write(MODE_REG, MR_BASE | MR_DMA_MODE);
1863#endif /* def REAL_DMA */ 1865#endif /* def REAL_DMA */