diff options
| author | Mark Brown <broonie@kernel.org> | 2019-08-23 12:00:22 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-08-23 12:00:22 +0100 |
| commit | 795227660d05e109b57896e2df1de0f012c64662 (patch) | |
| tree | 063c92088ee4c90b006a3b7e5c8f7837280694f7 /drivers/spi/spi-bcm2835.c | |
| parent | be28f76b7e8ffaf04690e30fd17683d8afea1fd9 (diff) | |
| parent | d41f36a6464a85c06ad920703d878e4491d2c023 (diff) | |
Merge branch 'spi-5.3' into spi-5.4
Diffstat (limited to 'drivers/spi/spi-bcm2835.c')
| -rw-r--r-- | drivers/spi/spi-bcm2835.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/spi/spi-bcm2835.c b/drivers/spi/spi-bcm2835.c index c96797844688..4b89e0a04ffd 100644 --- a/drivers/spi/spi-bcm2835.c +++ b/drivers/spi/spi-bcm2835.c @@ -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; |