spi: fsl-espi: fix merge conflict for commit "avoid processing uninitalized data...

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>

diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c
index a7e4c284d50a2e52017512222664a55c02f7d11c..4e8a99d0cb63a8216ad8473ed3e26dfda7bc6cdc 100644 (file)
--- 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;
                }
        }