diff options
Diffstat (limited to 'drivers/spi/spi-fsi.c')
| -rw-r--r-- | drivers/spi/spi-fsi.c | 12 | 
1 files changed, 6 insertions, 6 deletions
| diff --git a/drivers/spi/spi-fsi.c b/drivers/spi/spi-fsi.c index d403a7a3021d..72ab066ce552 100644 --- a/drivers/spi/spi-fsi.c +++ b/drivers/spi/spi-fsi.c @@ -319,12 +319,12 @@ static int fsi_spi_transfer_data(struct fsi_spi *ctx,  			end = jiffies + msecs_to_jiffies(SPI_FSI_STATUS_TIMEOUT_MS);  			do { +				if (time_after(jiffies, end)) +					return -ETIMEDOUT; +  				rc = fsi_spi_status(ctx, &status, "TX");  				if (rc)  					return rc; - -				if (time_after(jiffies, end)) -					return -ETIMEDOUT;  			} while (status & SPI_FSI_STATUS_TDR_FULL);  			sent += nb; @@ -337,12 +337,12 @@ static int fsi_spi_transfer_data(struct fsi_spi *ctx,  		while (transfer->len > recv) {  			end = jiffies + msecs_to_jiffies(SPI_FSI_STATUS_TIMEOUT_MS);  			do { +				if (time_after(jiffies, end)) +					return -ETIMEDOUT; +  				rc = fsi_spi_status(ctx, &status, "RX");  				if (rc)  					return rc; - -				if (time_after(jiffies, end)) -					return -ETIMEDOUT;  			} while (!(status & SPI_FSI_STATUS_RDR_FULL));  			rc = fsi_spi_read_reg(ctx, SPI_FSI_DATA_RX, &in); | 
