summaryrefslogtreecommitdiff
path: root/drivers/spi/spi-fsl-espi.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-10-26 13:30:11 +0300
committerMark Brown <broonie@kernel.org>2016-10-26 13:30:11 +0300
commitf9ce28f92385622070f398660e7b2066f02997c8 (patch)
treef9242f19f35f2868c42575865a1a15478d0be87a /drivers/spi/spi-fsl-espi.c
parent923ab15e1a5ce6248601304440e9f30fbf3bb6ab (diff)
parent5c0ba57744b1422d528f19430dd66d6803cea86f (diff)
downloadlinux-f9ce28f92385622070f398660e7b2066f02997c8.tar.xz
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.c4
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;
}
}