diff options
author | 2015-11-30 12:26:46 +0000 | |
---|---|---|
committer | 2015-11-30 12:26:46 +0000 | |
commit | 9f28b3c6ae70147416ef6cd5c26a0a4999f3c156 (patch) | |
tree | 3b85a88a3dfb8efa5f31fb820d43814f04d41bd6 /drivers | |
parent | Linux 4.4-rc3 (diff) | |
parent | spi: bugfix: spi_message.transfer_length does not get reset (diff) | |
download | linux-9f28b3c6ae70147416ef6cd5c26a0a4999f3c156.tar.gz linux-9f28b3c6ae70147416ef6cd5c26a0a4999f3c156.tar.bz2 linux-9f28b3c6ae70147416ef6cd5c26a0a4999f3c156.zip |
Merge remote-tracking branch 'spi/fix/core' into spi-linus
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/spi/spi.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index e2415be209d5..a0e346f3b71e 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -2130,6 +2130,7 @@ static int __spi_validate(struct spi_device *spi, struct spi_message *message) * Set transfer tx_nbits and rx_nbits as single transfer default * (SPI_NBITS_SINGLE) if it is not set for this transfer. */ + message->frame_length = 0; list_for_each_entry(xfer, &message->transfers, transfer_list) { message->frame_length += xfer->len; if (!xfer->bits_per_word) |