From: Heiner Kallweit <hkallweit1@gmail.com>
Date: Thu, 27 Oct 2016 18:24:19 +0000 (+0200)
Subject: spi: fsl-espi: fix merge conflict for commit "avoid processing uninitalized data... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e3cd6cf425bf40061418edf7b295f654301446fe;p=linux-beck.git

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>
---

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;
 		}
 	}