p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This commit is contained in:
Mark Brown 2013-09-01 13:48:58 +01:00
parent 84c86edab3 078726ce6d
commit 9020b75467
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/spi/spi.c
View File

@ -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) {

1
include/linux/spi/spi.h
View File

@ -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;