summaryrefslogtreecommitdiff
path: root/drivers/spi/spi-xilinx.c
diff options
context:
space:
mode:
authorRicardo Ribalda Delgado <ricardo.ribalda@gmail.com>2015-01-28 15:23:48 +0300
committerMark Brown <broonie@kernel.org>2015-01-28 22:42:43 +0300
commitc30929415a3d7f186da888d322f93150af308287 (patch)
tree8a7db031f7f75f840935446133b07f0be22a5331 /drivers/spi/spi-xilinx.c
parent24ba5e593f391507c614f5b62065194e6593a658 (diff)
downloadlinux-c30929415a3d7f186da888d322f93150af308287.tar.xz
spi/xilinx: Make spi_tx and spi_rx simmetric
spi_rx handles the case where the buffer is null. Nevertheless spi_tx did not handle it, and was handled by the caller function. Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi/spi-xilinx.c')
-rw-r--r--drivers/spi/spi-xilinx.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/spi/spi-xilinx.c b/drivers/spi/spi-xilinx.c
index ac94e546a555..6ce1066be98b 100644
--- a/drivers/spi/spi-xilinx.c
+++ b/drivers/spi/spi-xilinx.c
@@ -116,6 +116,10 @@ static unsigned int xspi_read32_be(void __iomem *addr)
static void xilinx_spi_tx(struct xilinx_spi *xspi)
{
+ if (!xspi->tx_ptr) {
+ xspi->write_fn(0, xspi->regs + XSPI_TXD_OFFSET);
+ return;
+ }
xspi->write_fn(*(u32 *)(xspi->tx_ptr), xspi->regs + XSPI_TXD_OFFSET);
xspi->tx_ptr += xspi->bits_per_word / 8;
}
@@ -230,10 +234,7 @@ static void xilinx_spi_fill_tx_fifo(struct xilinx_spi *xspi, int n_words)
xspi->remaining_bytes -= n_words * xspi->bits_per_word / 8;
while (n_words--)
- if (xspi->tx_ptr)
- xilinx_spi_tx(xspi);
- else
- xspi->write_fn(0, xspi->regs + XSPI_TXD_OFFSET);
+ xilinx_spi_tx(xspi);
return;
}