diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-06-30 06:26:31 (GMT) |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-06-30 06:26:31 (GMT) |
| commit | 78278fb152735c686cb13e1ae3bcee78fc2cd154 (patch) | |
| tree | ed3f669fbb4422bf3dfaa6b20ea992c04c1eac01 /drivers/spi/spi.c | |
| parent | 084eedbddaa526f53b20291ee7176be269620301 (diff) | |
| parent | 92905e331aea278665c4b27fbb13c4547a8bcbb0 (diff) | |
| download | linux-78278fb152735c686cb13e1ae3bcee78fc2cd154.tar.xz | |
Merge tag 'v4.9.35' into linux-linaro-lsk-v4.9
This is the 4.9.35 stable release
Diffstat (limited to 'drivers/spi/spi.c')
| -rw-r--r-- | drivers/spi/spi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 838783c..24d4492 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -1004,7 +1004,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; |