Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

parents 84c86eda 078726ce

drivers/spi/spi.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -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) {

include/linux/spi/spi.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -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;