aboutsummaryrefslogtreecommitdiff
path: root/drivers/spi/sun4i_spi.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-01-02 14:20:29 -0500
committerTom Rini <trini@konsulko.com>2019-01-02 14:20:29 -0500
commit695f67b5b3693232406a5cb3590d8fc5860c9f6c (patch)
tree0d45dc4ddd121e89665effc515c0091b288156dc /drivers/spi/sun4i_spi.c
parentf97c49d6a2f504d0f0a8aab37c67aa314e006250 (diff)
parent689795242b1cb7de5a3d8c8bf1a9582a8924ff69 (diff)
Merge branch 'master' of git://git.denx.de/u-boot-spi
Diffstat (limited to 'drivers/spi/sun4i_spi.c')
-rw-r--r--drivers/spi/sun4i_spi.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/spi/sun4i_spi.c b/drivers/spi/sun4i_spi.c
index b86b5a00ad..38cc743c61 100644
--- a/drivers/spi/sun4i_spi.c
+++ b/drivers/spi/sun4i_spi.c
@@ -129,7 +129,8 @@ static inline void sun4i_spi_drain_fifo(struct sun4i_spi_priv *priv, int len)
while (len--) {
byte = readb(&priv->regs->rxdata);
- *priv->rx_buf++ = byte;
+ if (priv->rx_buf)
+ *priv->rx_buf++ = byte;
}
}