diff options
| author | Jonas Aaberg <jonas.aberg@stericsson.com> | 2010-06-20 23:25:39 +0200 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2010-06-23 03:01:54 +0200 |
| commit | 2292b880e411276d127a020a1c35ca149fcca992 (patch) | |
| tree | 2f11c87c46cfbc6140649687854b0127dba1fcaa /drivers/dma/ste_dma40.c | |
| parent | DMAENGINE: ste_dma40: deny ops on non-alloc channels (diff) | |
| download | linux-2292b880e411276d127a020a1c35ca149fcca992.tar.xz linux-2292b880e411276d127a020a1c35ca149fcca992.zip | |
DMAENGINE: ste_dma40: lock fix
Fix up some locking issues found by enabling lock debugging.
Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/dma/ste_dma40.c')
| -rw-r--r-- | drivers/dma/ste_dma40.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c index 4d56d214fa05..ebffb53c036c 100644 --- a/drivers/dma/ste_dma40.c +++ b/drivers/dma/ste_dma40.c @@ -441,6 +441,7 @@ static int d40_lcla_id_get(struct d40_chan *d40c, pool->base + d40c->phy_chan->num * 1024; int i; int lli_per_log = d40c->base->plat_data->llis_per_log; + unsigned long flags; if (d40c->lcla.src_id >= 0 && d40c->lcla.dst_id >= 0) return 0; @@ -448,7 +449,7 @@ static int d40_lcla_id_get(struct d40_chan *d40c, if (pool->num_blocks > 32) return -EINVAL; - spin_lock(&pool->lock); + spin_lock_irqsave(&pool->lock, flags); for (i = 0; i < pool->num_blocks; i++) { if (!(pool->alloc_map[d40c->phy_chan->num] & (0x1 << i))) { @@ -477,10 +478,10 @@ static int d40_lcla_id_get(struct d40_chan *d40c, d40c->lcla.src = lcla_lidx_base + src_id * lli_per_log + 1; - spin_unlock(&pool->lock); + spin_unlock_irqrestore(&pool->lock, flags); return 0; err: - spin_unlock(&pool->lock); + spin_unlock_irqrestore(&pool->lock, flags); return -EINVAL; } @@ -488,15 +489,16 @@ static void d40_lcla_id_put(struct d40_chan *d40c, struct d40_lcla_pool *pool, int id) { + unsigned long flags; if (id < 0) return; d40c->lcla.src_id = -1; d40c->lcla.dst_id = -1; - spin_lock(&pool->lock); + spin_lock_irqsave(&pool->lock, flags); pool->alloc_map[d40c->phy_chan->num] &= (~(0x1 << id)); - spin_unlock(&pool->lock); + spin_unlock_irqrestore(&pool->lock, flags); } static int d40_channel_execute_command(struct d40_chan *d40c, @@ -1984,8 +1986,6 @@ static struct dma_async_tx_descriptor *d40_prep_slave_sg(struct dma_chan *chan, if (d40d == NULL) return NULL; - memset(d40d, 0, sizeof(struct d40_desc)); - if (d40c->log_num != D40_PHY_CHAN) err = d40_prep_slave_sg_log(d40d, d40c, sgl, sg_len, direction, dma_flags); |