hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Commit 5c0ba57744 ("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>
This commit is contained in:
Heiner Kallweit 2016-10-27 20:24:19 +02:00 committed by Mark Brown
parent f9ce28f923
commit e3cd6cf425
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/spi/spi-fsl-espi.c
View File

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