summaryrefslogtreecommitdiff
path: root/drivers/spi
diff options
context:
space:
mode:
authordillon min <dillon.minfei@gmail.com>2020-05-25 06:45:48 +0300
committerMark Brown <broonie@kernel.org>2020-05-25 17:56:17 +0300
commitaee67fe879e5030a2f5e1d9af3cb5b2a1027e78a (patch)
treeca043d6a4474144197c78657eea5f42e8f08f227 /drivers/spi
parent61367d0b8f5edf5146059ba8b79ce4e4485340b2 (diff)
downloadlinux-aee67fe879e5030a2f5e1d9af3cb5b2a1027e78a.tar.xz
spi: flags 'SPI_CONTROLLER_MUST_RX' and 'SPI_CONTROLLER_MUST_TX' can't be coexit with 'SPI_3WIRE' mode
since chip spi driver need get the transfer direction by 'tx_buf' and 'rx_buf' of 'struct spi_transfer' in 'SPI_3WIRE' mode. so, we need bypass 'SPI_CONTROLLER_MUST_RX' and 'SPI_CONTROLLER_MUST_TX' feature in 'SPI_3WIRE' mode Signed-off-by: dillon min <dillon.minfei@gmail.com> Link: https://lore.kernel.org/r/1590378348-8115-9-git-send-email-dillon.minfei@gmail.com Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index c765c966cc8e..9d0b3c292e1e 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -1023,7 +1023,8 @@ static int spi_map_msg(struct spi_controller *ctlr, struct spi_message *msg)
void *tmp;
unsigned int max_tx, max_rx;
- if (ctlr->flags & (SPI_CONTROLLER_MUST_RX | SPI_CONTROLLER_MUST_TX)) {
+ if ((ctlr->flags & (SPI_CONTROLLER_MUST_RX | SPI_CONTROLLER_MUST_TX))
+ && !(msg->spi->mode & SPI_3WIRE)) {
max_tx = 0;
max_rx = 0;