summaryrefslogtreecommitdiff
path: root/drivers/spi/spi.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-04-26 15:57:58 +0100
committerMark Brown <broonie@kernel.org>2017-04-26 15:57:58 +0100
commit42b1eadf4ead6e7d68f47cd985daa244823c96d3 (patch)
treebe921c2ae5753c2bc4a25c5ba2dc0e9f8e5cd02e /drivers/spi/spi.c
parentfbf3d36cb4c960b27b9c2e391d24127c5ec17a3a (diff)
parent833bfade96561216aa2129516a5926a0326860a2 (diff)
Merge remote-tracking branch 'spi/topic/core' into spi-next
Diffstat (limited to 'drivers/spi/spi.c')
-rw-r--r--drivers/spi/spi.c2
1 files changed, 1 insertions, 1 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;