Commit 9020b754 authored by Mark Brown's avatar Mark Brown

Merge remote-tracking branch 'spi/topic/msglen' into spi-next

parents 84c86eda 078726ce
...@@ -1380,6 +1380,7 @@ static int __spi_async(struct spi_device *spi, struct spi_message *message) ...@@ -1380,6 +1380,7 @@ static int __spi_async(struct spi_device *spi, struct spi_message *message)
* it is not set for this transfer. * it is not set for this transfer.
*/ */
list_for_each_entry(xfer, &message->transfers, transfer_list) { list_for_each_entry(xfer, &message->transfers, transfer_list) {
message->frame_length += xfer->len;
if (!xfer->bits_per_word) if (!xfer->bits_per_word)
xfer->bits_per_word = spi->bits_per_word; xfer->bits_per_word = spi->bits_per_word;
if (!xfer->speed_hz) { if (!xfer->speed_hz) {
......
...@@ -584,6 +584,7 @@ struct spi_message { ...@@ -584,6 +584,7 @@ struct spi_message {
/* completion is reported through a callback */ /* completion is reported through a callback */
void (*complete)(void *context); void (*complete)(void *context);
void *context; void *context;
unsigned frame_length;
unsigned actual_length; unsigned actual_length;
int status; int status;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment