xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'spi-5.3' into spi-5.4

Browse Source
This commit is contained in:
Mark Brown
2019-08-23 12:00:22 +01:00
parent be28f76b7e d41f36a646
commit 795227660d
8 changed files with 38 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/spi/spi-bcm2835.c
View File

@@ -834,7 +834,8 @@ static int bcm2835_spi_transfer_one(struct spi_controller *ctlr,
bcm2835_wr(bs, BCM2835_SPI_CLK, cdiv);
/* handle all the 3-wire mode */
if ((spi->mode & SPI_3WIRE) && (tfr->rx_buf))
if (spi->mode & SPI_3WIRE && tfr->rx_buf &&
tfr->rx_buf != ctlr->dummy_rx)
cs |= BCM2835_SPI_CS_REN;
else
cs &= ~BCM2835_SPI_CS_REN;