summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/NCR5380.c
diff options
context:
space:
mode:
authorRoel Kluin <roel.kluin@gmail.com>2010-08-11 03:01:11 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-11 17:59:00 +0200
commit085267acd0ca29623c8239a38639d43d6d21e972 (patch)
tree0f9f1b3fe7e33ec6bae67d403f9e085c92bb0075 /drivers/scsi/NCR5380.c
parentgdth: unmap ccb_phys when scsi_add_host() fails in gdth_eisa_probe_one() (diff)
downloadlinux-085267acd0ca29623c8239a38639d43d6d21e972.tar.xz
linux-085267acd0ca29623c8239a38639d43d6d21e972.zip
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 '')
-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
#endif
/* KLL May need eop and parity in 53c400 */
if (hostdata->flags & FLAG_NCR53C400)
- 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);
+ NCR5380_write(MODE_REG, MR_BASE | MR_DMA_MODE |
+ MR_ENABLE_PAR_CHECK | MR_ENABLE_PAR_INTR |
+ MR_ENABLE_EOP_INTR | MR_MONITOR_BSY);
else
NCR5380_write(MODE_REG, MR_BASE | MR_DMA_MODE);
#endif /* def REAL_DMA */