Commit e3cd6cf4 authored Oct 27, 2016 by Heiner Kallweit Committed by Mark Brown Oct 28, 2016

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



Commit 5c0ba577 ("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>

parent f9ce28f9

drivers/spi/spi-fsl-espi.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}
		}