Merge branch 'topic/ste_dma40' into for-linus

diff --cc drivers/dma/ste_dma40.c
index 08f3d7be2df047ed7d3a3d1477c612a70bebbfc1,b3af3c94c0bf15e212497ddbd75ec42c615116a4..8684d11b29bba16650ff1bf154dc3ce0a16d1984
--- 1/drivers/dma/ste_dma40.c
--- 2/drivers/dma/ste_dma40.c
+++ b/drivers/dma/ste_dma40.c
@@@ -1618,12 -1645,11 +1617,11 @@@ static void dma_tasklet(unsigned long d
  
        spin_unlock_irqrestore(&d40c->lock, flags);
  
 -      if (callback_active && callback)
 -              callback(callback_param);
 +      if (callback_active)
 +              dmaengine_desc_callback_invoke(&cb, NULL);
  
        return;
- 
- err:
+  check_pending_tx:
        /* Rescue manouver if receiving double interrupts */
        if (d40c->pending_tx > 0)
                d40c->pending_tx--;