diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-25 04:51:39 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-25 04:51:39 -0400 |
| commit | 5b380cb1522e774e2fd67392532963426a749ce8 (patch) | |
| tree | f8d0fcbebb14c387ed4dd71509aaa7af5a5ca9df /drivers/spi/spi-tegra20-sflash.c | |
| parent | 84b61465645fc075ab1128ebd4c34f6905037634 (diff) | |
| parent | e91d2352bb6ebd061b362b3c632ec517ac0c23b1 (diff) | |
Merge remote-tracking branch 'spi/topic/tegra' into spi-next
Diffstat (limited to 'drivers/spi/spi-tegra20-sflash.c')
| -rw-r--r-- | drivers/spi/spi-tegra20-sflash.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-tegra20-sflash.c b/drivers/spi/spi-tegra20-sflash.c index a68d7797a8ec..79be8ce6a9d1 100644 --- a/drivers/spi/spi-tegra20-sflash.c +++ b/drivers/spi/spi-tegra20-sflash.c | |||
| @@ -173,7 +173,7 @@ static unsigned tegra_sflash_calculate_curr_xfer_param( | |||
| 173 | unsigned remain_len = t->len - tsd->cur_pos; | 173 | unsigned remain_len = t->len - tsd->cur_pos; |
| 174 | unsigned max_word; | 174 | unsigned max_word; |
| 175 | 175 | ||
| 176 | tsd->bytes_per_word = (t->bits_per_word - 1) / 8 + 1; | 176 | tsd->bytes_per_word = DIV_ROUND_UP(t->bits_per_word, 8); |
| 177 | max_word = remain_len / tsd->bytes_per_word; | 177 | max_word = remain_len / tsd->bytes_per_word; |
| 178 | if (max_word > SPI_FIFO_DEPTH) | 178 | if (max_word > SPI_FIFO_DEPTH) |
| 179 | max_word = SPI_FIFO_DEPTH; | 179 | max_word = SPI_FIFO_DEPTH; |