diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-18 15:05:53 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-18 15:05:53 -0500 |
| commit | 59da1f87b276c593b852766c2fdcad62835970f7 (patch) | |
| tree | 3c3ace81c2132aaf13223df10c4491c38a46c976 /drivers/dma/dmaengine.c | |
| parent | 69098bac169d630a777b362470f20451b9446e39 (diff) | |
| parent | a06d568f7c5e40e34ea64881842deb8f4382babf (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_xor: dma_map destination DMA_BIDIRECTIONAL
dmaengine: protect 'id' from concurrent registrations
ioat: wait for self-test completion
Diffstat (limited to 'drivers/dma/dmaengine.c')
| -rw-r--r-- | drivers/dma/dmaengine.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c index 5317e08221ec..657996517374 100644 --- a/drivers/dma/dmaengine.c +++ b/drivers/dma/dmaengine.c | |||
| @@ -388,7 +388,10 @@ int dma_async_device_register(struct dma_device *device) | |||
| 388 | 388 | ||
| 389 | init_completion(&device->done); | 389 | init_completion(&device->done); |
| 390 | kref_init(&device->refcount); | 390 | kref_init(&device->refcount); |
| 391 | |||
| 392 | mutex_lock(&dma_list_mutex); | ||
| 391 | device->dev_id = id++; | 393 | device->dev_id = id++; |
| 394 | mutex_unlock(&dma_list_mutex); | ||
| 392 | 395 | ||
| 393 | /* represent channels in sysfs. Probably want devs too */ | 396 | /* represent channels in sysfs. Probably want devs too */ |
| 394 | list_for_each_entry(chan, &device->channels, device_node) { | 397 | list_for_each_entry(chan, &device->channels, device_node) { |