Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 085267acd0ca29623c8239a38639d43d6d21e972

Authored by Roel Kluin
Committed by Linus Torvalds
1 parent 2c076eea6d
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 1 changed file with 3 additions and 1 deletions Side-by-side Diff

drivers/scsi/NCR5380.c
Diff comments   View file @ 085267a
... ... @@ -1857,7 +1857,9 @@
1857 1857 #endif
1858 1858 /* KLL May need eop and parity in 53c400 */
1859 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 1863 else
1862 1864 NCR5380_write(MODE_REG, MR_BASE | MR_DMA_MODE);
1863 1865 #endif /* def REAL_DMA */