diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-03 14:48:54 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-03 14:48:54 -0500 |
| commit | d45fa563a62c908d0e9a581d4f091fed6371ebd0 (patch) | |
| tree | 84b80c025132e7d4619709dd9134681c8b014fa2 /drivers | |
| parent | a1cf11d8f673a3ad91012c5da96beed06ecefde1 (diff) | |
| parent | 8f33d5277fada0291ea495f7fd44a3e7b7aa41d3 (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:
dmaengine: provide dummy functions for DMA_ENGINE=n
mv_xor: fix race in tasklet function
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/dma/mv_xor.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/mv_xor.c b/drivers/dma/mv_xor.c index 411d5bf50fc4..a25f5f61e0e0 100644 --- a/drivers/dma/mv_xor.c +++ b/drivers/dma/mv_xor.c | |||
| @@ -449,7 +449,7 @@ mv_xor_slot_cleanup(struct mv_xor_chan *mv_chan) | |||
| 449 | static void mv_xor_tasklet(unsigned long data) | 449 | static void mv_xor_tasklet(unsigned long data) |
| 450 | { | 450 | { |
| 451 | struct mv_xor_chan *chan = (struct mv_xor_chan *) data; | 451 | struct mv_xor_chan *chan = (struct mv_xor_chan *) data; |
| 452 | __mv_xor_slot_cleanup(chan); | 452 | mv_xor_slot_cleanup(chan); |
| 453 | } | 453 | } |
| 454 | 454 | ||
| 455 | static struct mv_xor_desc_slot * | 455 | static struct mv_xor_desc_slot * |