summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-fsl-espi.c
diff options
context:
space:
mode:
authorHeiner Kallweit <hkallweit1@gmail.com>2016-10-27 20:24:19 +0200
committerMark Brown <broonie@kernel.org>2016-10-28 18:56:17 +0100
commite3cd6cf425bf40061418edf7b295f654301446fe (patch)
tree9a750a8da892ba70d8277bd1ab1151da818817d2 /drivers/spi/spi-fsl-espi.c
parentf9ce28f92385622070f398660e7b2066f02997c8 (diff)
downloadlinux-e3cd6cf425bf40061418edf7b295f654301446fe.tar.bz2
spi: fsl-espi: fix merge conflict for commit "avoid processing uninitalized data on error"
Commit 5c0ba57744b1 ("spi: fsl-espi: avoid processing uninitalized data on error") applied fine to stable but caused a merge conflict on next. This patch fixes that. Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi/spi-fsl-espi.c')
-rw-r--r--drivers/spi/spi-fsl-espi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c
index a7e4c284d50a..4e8a99d0cb63 100644
--- a/drivers/spi/spi-fsl-espi.c
+++ b/drivers/spi/spi-fsl-espi.c
@@ -456,7 +456,7 @@ static void fsl_espi_cpu_irq(struct mpc8xxx_spi *mspi, u32 events)
mspi->len -= rx_nr_bytes;
if (rx_nr_bytes && mspi->rx) {
- mspi->get_rx(rx_data, mspi);
+ *(u32 *)mspi->rx = rx_data;
mspi->rx += 4;
}
}