Merge branch 'fix/fsl-espi' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-fsl-espi

2016-10-26 11:30:11 +01:00 · 2016-10-26 11:30:11 +01:00 · f9ce28f923
parent 923ab15e1a 5c0ba57744
commit f9ce28f923
1 changed files with 2 additions and 2 deletions
--- a/drivers/spi/spi-fsl-espi.c
+++ b/drivers/spi/spi-fsl-espi.c
@ -455,8 +455,8 @@ static void fsl_espi_cpu_irq(struct mpc8xxx_spi *mspi, u32 events)

 		mspi->len -= rx_nr_bytes;

-		if (mspi->rx) {
-			*(u32 *)mspi->rx = rx_data;
+		if (rx_nr_bytes && mspi->rx) {
+			mspi->get_rx(rx_data, mspi);
 			mspi->rx += 4;
 		}
 	}