diff options
| author | Per Friden <per.friden@stericsson.com> | 2010-06-20 23:24:59 +0200 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2010-06-23 03:01:53 +0200 |
| commit | a8be8627a3a00859367d219848f2cd771d6aa925 (patch) | |
| tree | e7ef04effe6dd5102fea73f2f77da14bd6e2dee9 /drivers/dma | |
| parent | DMAENGINE: ste_dma40: only write phy channel config first time (diff) | |
| download | linux-a8be8627a3a00859367d219848f2cd771d6aa925.tar.xz linux-a8be8627a3a00859367d219848f2cd771d6aa925.zip | |
DMAENGINE: ste_dma40: moved freeing of client owned desc
fixed typo and moved freeing of client owned desc to free_dma.
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')
| -rw-r--r-- | drivers/dma/ste_dma40.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c index 9655452f0b69..d72eff6cfaef 100644 --- a/drivers/dma/ste_dma40.c +++ b/drivers/dma/ste_dma40.c @@ -374,7 +374,6 @@ static void d40_desc_remove(struct d40_desc *d40d) static struct d40_desc *d40_desc_get(struct d40_chan *d40c) { - struct d40_desc *desc; struct d40_desc *d; struct d40_desc *_d; @@ -583,8 +582,6 @@ done: static void d40_term_all(struct d40_chan *d40c) { struct d40_desc *d40d; - struct d40_desc *d; - struct d40_desc *_d; /* Release active descriptors */ while ((d40d = d40_first_active_get(d40c))) { @@ -602,15 +599,6 @@ static void d40_term_all(struct d40_chan *d40c) d40_desc_free(d40c, d40d); } - /* Release client owned descriptors */ - if (!list_empty(&d40c->client)) - list_for_each_entry_safe(d, _d, &d40c->client, node) { - d40_pool_lli_free(d); - d40_desc_remove(d); - /* Return desc to free-list */ - d40_desc_free(d40c, d40d); - } - d40_lcla_id_put(d40c, &d40c->base->lcla_pool, d40c->lcla.src_id); d40_lcla_id_put(d40c, &d40c->base->lcla_pool, @@ -1240,10 +1228,22 @@ static int d40_free_dma(struct d40_chan *d40c) u32 event, dir; struct d40_phy_res *phy = d40c->phy_chan; bool is_src; + struct d40_desc *d; + struct d40_desc *_d; + /* Terminate all queued and active transfers */ d40_term_all(d40c); + /* Release client owned descriptors */ + if (!list_empty(&d40c->client)) + list_for_each_entry_safe(d, _d, &d40c->client, node) { + d40_pool_lli_free(d); + d40_desc_remove(d); + /* Return desc to free-list */ + d40_desc_free(d40c, d); + } + if (phy == NULL) { dev_err(&d40c->chan.dev->device, "[%s] phy == null\n", __func__); |