summaryrefslogtreecommitdiff
path: root/drivers/spi/spi.c
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2019-06-17 10:19:39 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2019-06-17 10:19:38 -0700
commit4e933027e6848a194b03aa35c26bc20fe06205e9 (patch)
treeab1dda795bb590c589a5af45f0692b3b6f3c3931 /drivers/spi/spi.c
parentc176a066dfd36e31ebaf2796a12b2c523e7083dc (diff)
parent5ef154a26639ad07ed3ebdaea1dabe29065982b0 (diff)
Merge "Merge android-4.4.181 (bd858d7) into msm-4.4"
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 63446500d49c..5c7fd1571a01 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -903,6 +903,8 @@ static int spi_map_msg(struct spi_master *master, struct spi_message *msg)
if (max_tx || max_rx) {
list_for_each_entry(xfer, &msg->transfers,
transfer_list) {
+ if (!xfer->len)
+ continue;
if (!xfer->tx_buf)
xfer->tx_buf = master->dummy_tx;
if (!xfer->rx_buf)