diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2016-10-03 06:47:33 +0300 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2016-10-03 06:47:33 +0300 |
| commit | 11bfedff5594eef74617e6aa02986cf517526b98 (patch) | |
| tree | 2aa1a3b8d4e71abda7103b41edffb3a92ca26784 /drivers/dma/imx-sdma.c | |
| parent | 0a98f4b857e9aedf426d8b5b07699a8526e07530 (diff) | |
| parent | 793ae66c7dcc7e6655029f6613221a111b15b58e (diff) | |
| download | linux-11bfedff5594eef74617e6aa02986cf517526b98.tar.xz | |
Merge branch 'topic/err_reporting' into for-linus
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Conflicts:
drivers/dma/cppi41.c
Diffstat (limited to 'drivers/dma/imx-sdma.c')
| -rw-r--r-- | drivers/dma/imx-sdma.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index 03ec76fc22ff..624facb6c8f4 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -650,8 +650,7 @@ static void sdma_event_disable(struct sdma_channel *sdmac, unsigned int event) static void sdma_handle_channel_loop(struct sdma_channel *sdmac) { - if (sdmac->desc.callback) - sdmac->desc.callback(sdmac->desc.callback_param); + dmaengine_desc_get_callback_invoke(&sdmac->desc, NULL); } static void sdma_update_channel_loop(struct sdma_channel *sdmac) @@ -701,8 +700,8 @@ static void mxc_sdma_handle_channel_normal(struct sdma_channel *sdmac) sdmac->status = DMA_COMPLETE; dma_cookie_complete(&sdmac->desc); - if (sdmac->desc.callback) - sdmac->desc.callback(sdmac->desc.callback_param); + + dmaengine_desc_get_callback_invoke(&sdmac->desc, NULL); } static void sdma_tasklet(unsigned long data) |