From: Vinod Koul <vinod.koul@intel.com>
Date: Mon, 3 Oct 2016 04:05:55 +0000 (+0530)
Subject: Merge branch 'topic/ste_dma40' into for-linus
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f2469114c66158b36143a091255b4ed2d61fab7c;p=linux-beck.git

Merge branch 'topic/ste_dma40' into for-linus
---

f2469114c66158b36143a091255b4ed2d61fab7c
diff --cc drivers/dma/ste_dma40.c
index 08f3d7be2df0,b3af3c94c0bf..8684d11b29bb
--- a/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--;