]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
Merge branch 'fix/fsl-espi' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Wed, 26 Oct 2016 10:30:11 +0000 (11:30 +0100)
committerMark Brown <broonie@kernel.org>
Wed, 26 Oct 2016 10:30:11 +0000 (11:30 +0100)
1  2 
drivers/spi/spi-fsl-espi.c

index eea5123abb38e718a2bf72a856b952bc7f35b214,2c175b9495f7ee102a0d70a96f42fa730c019247..a7e4c284d50a2e52017512222664a55c02f7d11c
@@@ -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)) {