diff options
| author | Tom Rini <trini@konsulko.com> | 2018-04-25 20:50:28 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-04-25 20:50:28 -0400 |
| commit | a61f9d1fbbca3c5e59b907ad3071db70ef174872 (patch) | |
| tree | 2f48de9b45de0b4343a5150381dbe5b132ad86b9 /drivers/spi/designware_spi.c | |
| parent | 5512f5ccf1dc5cec068f8efa1d8ce81f51a988d3 (diff) | |
| parent | 9b14ac5cc2294ac3eaae92421abff27ed3e6caae (diff) | |
Merge git://git.denx.de/u-boot-spi
Diffstat (limited to 'drivers/spi/designware_spi.c')
| -rw-r--r-- | drivers/spi/designware_spi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/designware_spi.c b/drivers/spi/designware_spi.c index 0e93b62eee1..5e2d290ddcf 100644 --- a/drivers/spi/designware_spi.c +++ b/drivers/spi/designware_spi.c @@ -425,7 +425,7 @@ static int dw_spi_xfer(struct udevice *dev, unsigned int bitlen, * in the beginning of new transfer. */ if (readl_poll_timeout(priv->regs + DW_SPI_SR, val, - !(val & SR_TF_EMPT) || (val & SR_BUSY), + (val & SR_TF_EMPT) && !(val & SR_BUSY), RX_TIMEOUT * 1000)) { ret = -ETIMEDOUT; } |