diff options
| author | Mark Brown <broonie@linaro.org> | 2014-06-02 20:08:34 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-06-02 20:08:34 +0400 |
| commit | 15751f2e717c4cbdf17b0c21f2b1b23a939dafc9 (patch) | |
| tree | 3e80aaaa42dcea78740e4ab941d9920da5f8bdf9 /drivers/spi | |
| parent | 03689d2d75d38dd77c8148b742aa5a7befbcd736 (diff) | |
| parent | 80874d8c9e9cbfa195572dfea46f2314098b3869 (diff) | |
| download | linux-15751f2e717c4cbdf17b0c21f2b1b23a939dafc9.tar.xz | |
Merge remote-tracking branch 'spi/topic/core' into spi-next
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 939edf473235..be13a35c6fec 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -796,7 +796,7 @@ static int spi_transfer_one_message(struct spi_master *master, if (ret > 0) { ret = 0; ms = xfer->len * 8 * 1000 / xfer->speed_hz; - ms += 10; /* some tolerance */ + ms += ms + 100; /* some tolerance */ ms = wait_for_completion_timeout(&master->xfer_completion, msecs_to_jiffies(ms)); @@ -1268,11 +1268,10 @@ static void of_register_spi_devices(struct spi_master *master) spi->mode |= SPI_TX_QUAD; break; default: - dev_err(&master->dev, - "spi-tx-bus-width %d not supported\n", - value); - spi_dev_put(spi); - continue; + dev_warn(&master->dev, + "spi-tx-bus-width %d not supported\n", + value); + break; } } @@ -1287,11 +1286,10 @@ static void of_register_spi_devices(struct spi_master *master) spi->mode |= SPI_RX_QUAD; break; default: - dev_err(&master->dev, - "spi-rx-bus-width %d not supported\n", - value); - spi_dev_put(spi); - continue; + dev_warn(&master->dev, + "spi-rx-bus-width %d not supported\n", + value); + break; } } |