diff options
| author | Mark Brown <broonie@kernel.org> | 2014-09-13 17:03:05 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-09-13 17:03:05 +0100 |
| commit | 551f6a58d496a99702088ac762f247e04d8bfff9 (patch) | |
| tree | 95610bb3eae95bd98d1c80bcd161be67c33a81f7 /drivers/spi/spi-tegra20-sflash.c | |
| parent | 197e96b4d80554a66aff34df5406b4c2d26f0111 (diff) | |
| parent | a2cea9831e7df2bd21ade3c02be4a94146e1645b (diff) | |
Merge branch 'topic/checkpatch' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-dw
Diffstat (limited to 'drivers/spi/spi-tegra20-sflash.c')
| -rw-r--r-- | drivers/spi/spi-tegra20-sflash.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/spi/spi-tegra20-sflash.c b/drivers/spi/spi-tegra20-sflash.c index 3548ce25c08f..cd66fe7b78a9 100644 --- a/drivers/spi/spi-tegra20-sflash.c +++ b/drivers/spi/spi-tegra20-sflash.c @@ -99,7 +99,7 @@ #define SPI_TX_TRIG_MASK (0x3 << 16) #define SPI_TX_TRIG_1W (0x0 << 16) #define SPI_TX_TRIG_4W (0x1 << 16) -#define SPI_DMA_BLK_COUNT(count) (((count) - 1) & 0xFFFF); +#define SPI_DMA_BLK_COUNT(count) (((count) - 1) & 0xFFFF) #define SPI_TX_FIFO 0x10 #define SPI_RX_FIFO 0x20 @@ -221,6 +221,7 @@ static int tegra_sflash_read_rx_fifo_to_client_rxbuf( while (!(status & SPI_RXF_EMPTY)) { int i; u32 x = tegra_sflash_readl(tsd, SPI_RX_FIFO); + for (i = 0; (i < tsd->bytes_per_word); i++) *rx_buf++ = (x >> (i*8)) & 0xFF; read_words++; |