projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'md/4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md
[cascardo/linux.git]
/
drivers
/
dma
/
mxs-dma.c
diff --git
a/drivers/dma/mxs-dma.c
b/drivers/dma/mxs-dma.c
index
1e3572b
..
e217268
100644
(file)
--- a/
drivers/dma/mxs-dma.c
+++ b/
drivers/dma/mxs-dma.c
@@
-326,8
+326,7
@@
static void mxs_dma_tasklet(unsigned long data)
{
struct mxs_dma_chan *mxs_chan = (struct mxs_dma_chan *) data;
{
struct mxs_dma_chan *mxs_chan = (struct mxs_dma_chan *) data;
- if (mxs_chan->desc.callback)
- mxs_chan->desc.callback(mxs_chan->desc.callback_param);
+ dmaengine_desc_get_callback_invoke(&mxs_chan->desc, NULL);
}
static int mxs_dma_irq_to_chan(struct mxs_dma_engine *mxs_dma, int irq)
}
static int mxs_dma_irq_to_chan(struct mxs_dma_engine *mxs_dma, int irq)