summaryrefslogtreecommitdiff
path: root/drivers/spi/zynq_spi.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-09-22 15:36:45 (GMT)
committerTom Rini <trini@konsulko.com>2016-09-22 15:36:45 (GMT)
commit19d051a2b78b626ea3f8103a9a08e73508ba9fa6 (patch)
treebef8b4aa02b9a2375a611778aa8460ac2235750b /drivers/spi/zynq_spi.c
parent58c8c0963b1c720802c46ac4288c897e5f9cd296 (diff)
parentfe4753cbc6c51f712024121aad0d21293d6a85fc (diff)
downloadu-boot-19d051a2b78b626ea3f8103a9a08e73508ba9fa6.tar.xz
Merge branch 'master' of git://git.denx.de/u-boot-spi
Diffstat (limited to 'drivers/spi/zynq_spi.c')
-rw-r--r--drivers/spi/zynq_spi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/zynq_spi.c b/drivers/spi/zynq_spi.c
index 7a176a2..15ca271 100644
--- a/drivers/spi/zynq_spi.c
+++ b/drivers/spi/zynq_spi.c
@@ -233,7 +233,7 @@ static int zynq_spi_xfer(struct udevice *dev, unsigned int bitlen,
/* Read the data from RX FIFO */
status = readl(&regs->isr);
- while (status & ZYNQ_SPI_IXR_RXNEMPTY_MASK) {
+ while ((status & ZYNQ_SPI_IXR_RXNEMPTY_MASK) && rx_len) {
buf = readl(&regs->rxdr);
if (rx_buf)
*rx_buf++ = buf;