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

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

View file

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