leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mark Brown 2017-04-26 15:57:58 +01:00
commit 42b1eadf4e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/spi/spi.c
View File

@ -1015,7 +1015,7 @@ static int spi_transfer_one_message(struct spi_master *master,
ret = 0; ret = 0;
ms = 8LL * 1000LL * xfer->len; ms = 8LL * 1000LL * xfer->len;
do_div(ms, xfer->speed_hz); do_div(ms, xfer->speed_hz);
ms += ms + 100; /* some tolerance */ ms += ms + 200; /* some tolerance */
if (ms > UINT_MAX) if (ms > UINT_MAX)
ms = UINT_MAX; ms = UINT_MAX;

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

@ -891,7 +891,7 @@ static inline struct spi_message *spi_message_alloc(unsigned ntrans, gfp_t flags
unsigned i; unsigned i;
struct spi_transfer *t = (struct spi_transfer *)(m + 1); 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++) for (i = 0; i < ntrans; i++, t++)
spi_message_add_tail(t, m); spi_message_add_tail(t, m);
} }