diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-09-07 10:33:52 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-10-12 11:36:10 -0400 |
| commit | 5356d94872502e77317f82e8fcae2a0b162af07c (patch) | |
| tree | 2376d0e2652968000dddbdb708b9f9716e0a326e | |
| parent | 5b8c4f23c54edda640a4850bc9b81dee70acb525 (diff) | |
arm: Bcmring: semaphore cleanup
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Leo Chen <leochen@broadcom.com>
LKML-Reference: <20100907125057.371771121@linutronix.de>
| -rw-r--r-- | arch/arm/mach-bcmring/dma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-bcmring/dma.c b/arch/arm/mach-bcmring/dma.c index 29c0a911df26..77eb35c89cd0 100644 --- a/arch/arm/mach-bcmring/dma.c +++ b/arch/arm/mach-bcmring/dma.c | |||
| @@ -691,7 +691,7 @@ int dma_init(void) | |||
| 691 | 691 | ||
| 692 | memset(&gDMA, 0, sizeof(gDMA)); | 692 | memset(&gDMA, 0, sizeof(gDMA)); |
| 693 | 693 | ||
| 694 | init_MUTEX_LOCKED(&gDMA.lock); | 694 | sema_init(&gDMA.lock, 0); |
| 695 | init_waitqueue_head(&gDMA.freeChannelQ); | 695 | init_waitqueue_head(&gDMA.freeChannelQ); |
| 696 | 696 | ||
| 697 | /* Initialize the Hardware */ | 697 | /* Initialize the Hardware */ |
| @@ -1574,7 +1574,7 @@ int dma_init_mem_map(DMA_MemMap_t *memMap) | |||
| 1574 | { | 1574 | { |
| 1575 | memset(memMap, 0, sizeof(*memMap)); | 1575 | memset(memMap, 0, sizeof(*memMap)); |
| 1576 | 1576 | ||
| 1577 | init_MUTEX(&memMap->lock); | 1577 | sema_init(&memMap->lock, 1); |
| 1578 | 1578 | ||
| 1579 | return 0; | 1579 | return 0; |
| 1580 | } | 1580 | } |
