diff options
| author | Mark Brown <broonie@kernel.org> | 2019-03-15 13:06:34 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-03-15 13:06:34 -0400 |
| commit | 3949ba3b3724e0304b0989ca4c1d785a1fb93ba0 (patch) | |
| tree | 6508295ee9d9e2dccb2a5a3dc053cdbb98d555b6 /drivers/spi/spi-imx.c | |
| parent | 6d85028134d3f4f946924e2f9f0aaff47d9de840 (diff) | |
| parent | 5356c2c70e385198e1a753ee364323f2fc01f759 (diff) | |
Merge branch 'spi-5.1' into spi-5.2 for stm32
Diffstat (limited to 'drivers/spi/spi-imx.c')
| -rw-r--r-- | drivers/spi/spi-imx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c index e08646e715ba..09c9a1edb2c6 100644 --- a/drivers/spi/spi-imx.c +++ b/drivers/spi/spi-imx.c | |||
| @@ -1501,7 +1501,7 @@ static int spi_imx_transfer(struct spi_device *spi, | |||
| 1501 | 1501 | ||
| 1502 | /* flush rxfifo before transfer */ | 1502 | /* flush rxfifo before transfer */ |
| 1503 | while (spi_imx->devtype_data->rx_available(spi_imx)) | 1503 | while (spi_imx->devtype_data->rx_available(spi_imx)) |
| 1504 | spi_imx->rx(spi_imx); | 1504 | readl(spi_imx->base + MXC_CSPIRXDATA); |
| 1505 | 1505 | ||
| 1506 | if (spi_imx->slave_mode) | 1506 | if (spi_imx->slave_mode) |
| 1507 | return spi_imx_pio_transfer_slave(spi, transfer); | 1507 | return spi_imx_pio_transfer_slave(spi, transfer); |