diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-25 08:51:21 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-25 08:51:21 (GMT) |
| commit | 2ef2e60d2f4d470b0cb591baeaf942316c0673ed (patch) | |
| tree | d70316198ee16e96d84d75ddcb5e7d74124b1efd /drivers/spi/spi-omap2-mcspi.c | |
| parent | c55b869ac49587290f24cb5c8a4e7023c90dfb3f (diff) | |
| parent | 543c954d6807ad0682c37846b7b9c423cd941415 (diff) | |
| download | linux-2ef2e60d2f4d470b0cb591baeaf942316c0673ed.tar.xz | |
Merge remote-tracking branch 'spi/topic/atmel' into spi-next
Diffstat (limited to 'drivers/spi/spi-omap2-mcspi.c')
| -rw-r--r-- | drivers/spi/spi-omap2-mcspi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c index 32dca0c..c4e4868 100644 --- a/drivers/spi/spi-omap2-mcspi.c +++ b/drivers/spi/spi-omap2-mcspi.c @@ -504,7 +504,7 @@ omap2_mcspi_rx_dma(struct spi_device *spi, struct spi_transfer *xfer, ((u32 *)xfer->rx_buf)[elements++] = w; } else { int bytes_per_word = mcspi_bytes_per_word(word_len); - dev_err(&spi->dev, "DMA RX penultimate word empty"); + dev_err(&spi->dev, "DMA RX penultimate word empty\n"); count -= (bytes_per_word << 1); omap2_mcspi_set_enable(spi, 1); return count; @@ -522,7 +522,7 @@ omap2_mcspi_rx_dma(struct spi_device *spi, struct spi_transfer *xfer, else /* word_len <= 32 */ ((u32 *)xfer->rx_buf)[elements] = w; } else { - dev_err(&spi->dev, "DMA RX last word empty"); + dev_err(&spi->dev, "DMA RX last word empty\n"); count -= mcspi_bytes_per_word(word_len); } omap2_mcspi_set_enable(spi, 1); |