aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2019-03-15 13:06:34 -0400
committerMark Brown <broonie@kernel.org>2019-03-15 13:06:34 -0400
commit3949ba3b3724e0304b0989ca4c1d785a1fb93ba0 (patch)
tree6508295ee9d9e2dccb2a5a3dc053cdbb98d555b6 /drivers/spi/spi.c
parent6d85028134d3f4f946924e2f9f0aaff47d9de840 (diff)
parent5356c2c70e385198e1a753ee364323f2fc01f759 (diff)
Merge branch 'spi-5.1' into spi-5.2 for stm32
Diffstat (limited to 'drivers/spi/spi.c')
-rw-r--r--drivers/spi/spi.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 93986f879b09..2be394d3bc59 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -1039,6 +1039,8 @@ static int spi_map_msg(struct spi_controller *ctlr, struct spi_message *msg)
1039 if (max_tx || max_rx) { 1039 if (max_tx || max_rx) {
1040 list_for_each_entry(xfer, &msg->transfers, 1040 list_for_each_entry(xfer, &msg->transfers,
1041 transfer_list) { 1041 transfer_list) {
1042 if (!xfer->len)
1043 continue;
1042 if (!xfer->tx_buf) 1044 if (!xfer->tx_buf)
1043 xfer->tx_buf = ctlr->dummy_tx; 1045 xfer->tx_buf = ctlr->dummy_tx;
1044 if (!xfer->rx_buf) 1046 if (!xfer->rx_buf)