git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'spi/topic/core' into spi-next
[sfrench/cifs-2.6.git]
/
drivers
/
spi
/
spi.c
diff --git
a/drivers/spi/spi.c
b/drivers/spi/spi.c
index 90b5b2efafbf45c2435af2771c4842a37786eee7..b4a8bb7759b2cdc7cf2a4e9688cda03523f431a9 100644
(file)
--- 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 +
1
00; /* some tolerance */
+ ms += ms +
2
00; /* some tolerance */
if (ms > UINT_MAX)
ms = UINT_MAX;