diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-05 17:35:56 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-05 17:35:56 -0400 |
commit | 45d866e1a06dba309f79dbb61ad1db964bb8ee8a (patch) | |
tree | 4fa600d4d319294fcec5f338a133c0db92436a49 | |
parent | 6f74b1849bf04432c4a2fe21f594136e5b9d1fad (diff) | |
parent | de24125dd0a452bfd4502fc448e3534c5d2e87aa (diff) |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:
async_tx: fix the bug in async_tx_run_dependencies
-rw-r--r-- | crypto/async_tx/async_tx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/async_tx/async_tx.c b/crypto/async_tx/async_tx.c index 85eaf7b1c531..e8362c1efa30 100644 --- a/crypto/async_tx/async_tx.c +++ b/crypto/async_tx/async_tx.c | |||
@@ -137,7 +137,8 @@ async_tx_run_dependencies(struct dma_async_tx_descriptor *tx) | |||
137 | spin_lock_bh(&next->lock); | 137 | spin_lock_bh(&next->lock); |
138 | next->parent = NULL; | 138 | next->parent = NULL; |
139 | _next = next->next; | 139 | _next = next->next; |
140 | next->next = NULL; | 140 | if (_next && _next->chan == chan) |
141 | next->next = NULL; | ||
141 | spin_unlock_bh(&next->lock); | 142 | spin_unlock_bh(&next->lock); |
142 | 143 | ||
143 | next->tx_submit(next); | 144 | next->tx_submit(next); |