Merge tag 'spi-fix-v4.5-rc4' into spi-imx

spi: Fixes for v4.5

A small clutch of driver specific fixes.  The OMAP one is a bit worrying
since it seems to be triggered by some changes in the runtime PM core
code and I suspect there's other drivers across that are going to be
using the same pattern outside of OMAP but nothing seems to be coming up
in the testing people are doing.

diff --cc drivers/spi/spi-imx.c
index 7ac206b8cc931b89e5cc7913cacfd7611c363201,6a4ff27f4357eb229815c18b535327487f2df580..0313293323ccbfa97f59cf5c36a94e60bc706f68
--- 1/drivers/spi/spi-imx.c
--- 2/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@@ -1006,8 -1008,12 +1006,10 @@@ static int spi_imx_dma_transfer(struct 
  
        return ret;
  
- no_dma:
+ rx_nodma:
+       dmaengine_terminate_all(master->dma_tx);
+ tx_nodma:
 -      pr_warn_once("%s %s: DMA not available, falling back to PIO\n",
 -                   dev_driver_string(&master->dev),
 -                   dev_name(&master->dev));
 +      dev_warn_once(spi_imx->dev, "DMA not available, falling back to PIO\n");
        return -EAGAIN;
  }