diff options
author | Yuri Tikhonov <yur@emcraft.com> | 2009-01-12 17:17:20 -0500 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2009-01-12 17:19:29 -0500 |
commit | dd59b8537f6cb53ab863fafad86a5828f1e889a2 (patch) | |
tree | a1236a8042583813fc7b9e32688b9bc6e7858ea0 /drivers | |
parent | c59765042f53a79a7a65585042ff463b69cb248c (diff) |
dmaengine: fix dependency chaining
In dmaengine we track the dependencies between the descriptors
using the 'next' pointers of the structure. These pointers are
set to NULL as soon as the corresponding descriptor has been
submitted to the channel (in dma_run_dependencies()).
But, the first 'next' in chain is still remaining set, regardless
the fact, that tx->next has been already submitted. This may lead to
multiple submissions of the same descriptor. This patch fixes this.
Actually, some previous implementation of the xxx_run_dependencies()
function already had this fix in place. The fdb..0eaf3 commit, beside the
correct things, broke this.
Cc: <stable@kernel.org>
Signed-off-by: Yuri Tikhonov <yur@emcraft.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/dma/dmaengine.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c index 403dbe781122..6df144a65fef 100644 --- a/drivers/dma/dmaengine.c +++ b/drivers/dma/dmaengine.c | |||
@@ -961,6 +961,8 @@ void dma_run_dependencies(struct dma_async_tx_descriptor *tx) | |||
961 | if (!dep) | 961 | if (!dep) |
962 | return; | 962 | return; |
963 | 963 | ||
964 | /* we'll submit tx->next now, so clear the link */ | ||
965 | tx->next = NULL; | ||
964 | chan = dep->chan; | 966 | chan = dep->chan; |
965 | 967 | ||
966 | /* keep submitting up until a channel switch is detected | 968 | /* keep submitting up until a channel switch is detected |