diff options
| author | Mark Brown <broonie@kernel.org> | 2019-03-15 18:06:34 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-03-15 18:06:34 +0100 |
| commit | 3949ba3b3724e0304b0989ca4c1d785a1fb93ba0 (patch) | |
| tree | 6508295ee9d9e2dccb2a5a3dc053cdbb98d555b6 /drivers/spi/spi-imx.c | |
| parent | spi: fix SPI_BPW_RANGE_MASK() regression (diff) | |
| parent | spi: spi-mem: stm32-qspi: avoid memory corruption at low frequency (diff) | |
| download | linux-3949ba3b3724e0304b0989ca4c1d785a1fb93ba0.tar.xz linux-3949ba3b3724e0304b0989ca4c1d785a1fb93ba0.zip | |
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, /* flush rxfifo before transfer */ while (spi_imx->devtype_data->rx_available(spi_imx)) - spi_imx->rx(spi_imx); + readl(spi_imx->base + MXC_CSPIRXDATA); if (spi_imx->slave_mode) return spi_imx_pio_transfer_slave(spi, transfer); |