diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-23 10:24:15 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-23 10:24:15 -0500 |
| commit | bf8bd66d0580f296f257d371ee41a0a137b541c7 (patch) | |
| tree | 4c7f7471005b4436d40ba52edd51214d12331f25 /drivers/dma/dmaengine.c | |
| parent | 8ae936690972dfcad73d0dde1095b9f32af5ee95 (diff) | |
| parent | 1ccedb7cdba6886939dd8b4c8f965a826f696e56 (diff) | |
Merge branch 'x86/apic' into x86/irq
Conflicts:
arch/x86/kernel/apic.c
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) { |