diff options
| author | Mark Brown <broonie@kernel.org> | 2016-10-26 12:30:11 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-10-26 12:30:11 +0200 |
| commit | f9ce28f92385622070f398660e7b2066f02997c8 (patch) | |
| tree | f9242f19f35f2868c42575865a1a15478d0be87a /drivers/spi/spi-fsl-espi.c | |
| parent | spi: fsl-espi: fix handling of word sizes other than 8 bit (diff) | |
| parent | spi: fsl-espi: avoid processing uninitalized data on error (diff) | |
| download | linux-f9ce28f92385622070f398660e7b2066f02997c8.tar.xz linux-f9ce28f92385622070f398660e7b2066f02997c8.zip | |
Merge branch 'fix/fsl-espi' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-fsl-espi
Diffstat (limited to 'drivers/spi/spi-fsl-espi.c')
| -rw-r--r-- | drivers/spi/spi-fsl-espi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c index eea5123abb38..a7e4c284d50a 100644 --- a/drivers/spi/spi-fsl-espi.c +++ b/drivers/spi/spi-fsl-espi.c @@ -455,8 +455,8 @@ static void fsl_espi_cpu_irq(struct mpc8xxx_spi *mspi, u32 events) mspi->len -= rx_nr_bytes; - if (mspi->rx) { - *(u32 *)mspi->rx = rx_data; + if (rx_nr_bytes && mspi->rx) { + mspi->get_rx(rx_data, mspi); mspi->rx += 4; } } |