From: Vinod Koul <vinod.koul@intel.com>
Date: Mon, 3 Oct 2016 03:47:33 +0000 (+0530)
Subject: Merge branch 'topic/err_reporting' into for-linus
X-Git-Tag: v4.14-rc1~2349^2~13
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=11bfedff5594eef74617e6aa02986cf517526b98;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'topic/err_reporting' into for-linus

Signed-off-by: Vinod Koul <vinod.koul@intel.com>

Conflicts:
	drivers/dma/cppi41.c
---

11bfedff5594eef74617e6aa02986cf517526b98
diff --cc drivers/dma/cppi41.c
index 97f4d6c,3b4c842..bac5f02
--- a/drivers/dma/cppi41.c
+++ b/drivers/dma/cppi41.c
@@@ -336,11 -331,7 +336,11 @@@ static irqreturn_t cppi41_irq(int irq, 
  
  			c->residue = pd_trans_len(c->desc->pd6) - len;
  			dma_cookie_complete(&c->txd);
- 			c->txd.callback(c->txd.callback_param);
+ 			dmaengine_desc_get_callback_invoke(&c->txd, NULL);
 +
 +			/* Paired with cppi41_dma_issue_pending */
 +			pm_runtime_mark_last_busy(cdd->ddev.dev);
 +			pm_runtime_put_autosuspend(cdd->ddev.dev);
  		}
  	}
  	return IRQ_HANDLED;