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

Commit 42b1eadf authored by Mark Brown's avatar Mark Brown
Browse files

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

parents fbf3d36c 833bfade

drivers/spi/spi.c

+1 −1
Original line number Diff line number Diff line
@@ -1015,7 +1015,7 @@ static int spi_transfer_one_message(struct spi_master *master, 
				ret = 0;

				ms = 8LL * 1000LL * xfer->len;

				do_div(ms, xfer->speed_hz);

				ms += ms + 100; /* some tolerance */

				ms += ms + 200; /* some tolerance */



				if (ms > UINT_MAX)

					ms = UINT_MAX;

include/linux/spi/spi.h

+1 −1
Original line number Diff line number Diff line
@@ -891,7 +891,7 @@ static inline struct spi_message *spi_message_alloc(unsigned ntrans, gfp_t flags 
		unsigned i;

		struct spi_transfer *t = (struct spi_transfer *)(m + 1);



		INIT_LIST_HEAD(&m->transfers);

		spi_message_init_no_memset(m);

		for (i = 0; i < ntrans; i++, t++)

			spi_message_add_tail(t, m);

	}