From: Mark Brown <broonie@kernel.org>
Date: Wed, 26 Oct 2016 10:30:11 +0000 (+0100)
Subject: Merge branch 'fix/fsl-espi' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f9ce28f92385622070f398660e7b2066f02997c8;p=linux-beck.git

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

f9ce28f92385622070f398660e7b2066f02997c8
diff --cc drivers/spi/spi-fsl-espi.c
index eea5123abb38,2c175b9495f7..a7e4c284d50a
--- a/drivers/spi/spi-fsl-espi.c
+++ b/drivers/spi/spi-fsl-espi.c
@@@ -455,10 -458,8 +455,10 @@@ static void fsl_espi_cpu_irq(struct mpc
  
  		mspi->len -= rx_nr_bytes;
  
- 		if (mspi->rx) {
- 			*(u32 *)mspi->rx = rx_data;
 -		if (rx_nr_bytes && mspi->rx)
++		if (rx_nr_bytes && mspi->rx) {
+ 			mspi->get_rx(rx_data, mspi);
 +			mspi->rx += 4;
 +		}
  	}
  
  	if (!(events & SPIE_TNF)) {