diff options
| author | Mark Brown | 2013-09-01 13:48:58 +0100 |
|---|---|---|
| committer | Mark Brown | 2013-09-01 13:48:58 +0100 |
| commit | 9020b75467ff81b2ae257bbf19acff462854d4ab (patch) | |
| tree | 42345d07017a00013edd4ee36d718776ee5ceb22 /drivers/spi | |
| parent | 84c86edab3a37f5f650d0b3bb0f9803f9fbf2a8b (diff) | |
| parent | 078726ce6d56a767533064e0f2f2100d7cb6fc22 (diff) | |
Merge remote-tracking branch 'spi/topic/msglen' into spi-next
Diffstat (limited to 'drivers/spi')
| -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 8bc7de019e5d..7ed5c147c073 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -1380,6 +1380,7 @@ static int __spi_async(struct spi_device *spi, struct spi_message *message) * it is not set for this transfer. */ list_for_each_entry(xfer, &message->transfers, transfer_list) { + message->frame_length += xfer->len; if (!xfer->bits_per_word) xfer->bits_per_word = spi->bits_per_word; if (!xfer->speed_hz) { |