diff options
| author | Mark Brown <broonie@kernel.org> | 2017-04-26 15:57:58 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-04-26 15:57:58 +0100 |
| commit | 42b1eadf4ead6e7d68f47cd985daa244823c96d3 (patch) | |
| tree | be921c2ae5753c2bc4a25c5ba2dc0e9f8e5cd02e | |
| parent | fbf3d36cb4c960b27b9c2e391d24127c5ec17a3a (diff) | |
| parent | 833bfade96561216aa2129516a5926a0326860a2 (diff) | |
Merge remote-tracking branch 'spi/topic/core' into spi-next
| -rw-r--r-- | drivers/spi/spi.c | 2 | ||||
| -rw-r--r-- | include/linux/spi/spi.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 90b5b2efafbf..b4a8bb7759b2 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -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; diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h index 75c6bd0ac605..3b0070695375 100644 --- a/include/linux/spi/spi.h +++ b/include/linux/spi/spi.h @@ -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); } |