diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-06 10:51:57 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-06 10:51:57 -0400 |
| commit | 7f79d852ed30a06eebf7497afe9334a726db3d40 (patch) | |
| tree | 0057281f17501b635d3d88cda9a14203706f5dcc /crypto/async_tx/async_tx.c | |
| parent | aef745fca016aea45adae5c98e8698904dd8ad51 (diff) | |
| parent | 70bb08962ea9bd50797ae9f16b2493f5f7c65053 (diff) | |
Merge branch 'linus' into sched/devel
Diffstat (limited to 'crypto/async_tx/async_tx.c')
| -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); |