diff options
author | Mark Brown <broonie@kernel.org> | 2015-11-30 07:26:46 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-11-30 07:26:46 -0500 |
commit | 9f28b3c6ae70147416ef6cd5c26a0a4999f3c156 (patch) | |
tree | 3b85a88a3dfb8efa5f31fb820d43814f04d41bd6 | |
parent | 31ade3b83e1821da5fbb2f11b5b3d4ab2ec39db8 (diff) | |
parent | 77e8058810303e5c18b462adb4f761dbb4f3b657 (diff) |
Merge remote-tracking branch 'spi/fix/core' into spi-linus
-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) | |||
2130 | * Set transfer tx_nbits and rx_nbits as single transfer default | 2130 | * Set transfer tx_nbits and rx_nbits as single transfer default |
2131 | * (SPI_NBITS_SINGLE) if it is not set for this transfer. | 2131 | * (SPI_NBITS_SINGLE) if it is not set for this transfer. |
2132 | */ | 2132 | */ |
2133 | message->frame_length = 0; | ||
2133 | list_for_each_entry(xfer, &message->transfers, transfer_list) { | 2134 | list_for_each_entry(xfer, &message->transfers, transfer_list) { |
2134 | message->frame_length += xfer->len; | 2135 | message->frame_length += xfer->len; |
2135 | if (!xfer->bits_per_word) | 2136 | if (!xfer->bits_per_word) |