From b1998056358461066fb858816e3a93364ceac64d Mon Sep 17 00:00:00 2001 From: Per Forlin Date: Mon, 29 Aug 2011 13:33:33 +0200 Subject: [PATCH] --- yaml --- r: 263683 b: refs/heads/master c: 3b3d5b0f855b3eec45a02832e97c3c1890ff8823 h: refs/heads/master i: 263681: d2b3ce844b4bb6f9a0d5b06c09feb15388ce2fc6 263679: 9b318b91cac13ec4f1a72906664d6aaf2ee7aab4 v: v3 --- [refs] | 2 +- trunk/drivers/dma/ste_dma40.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 04d635af9187..788dfcbe82fb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: da063d260969c4e5e5f91d911ba87f7f6b48ead0 +refs/heads/master: 3b3d5b0f855b3eec45a02832e97c3c1890ff8823 diff --git a/trunk/drivers/dma/ste_dma40.c b/trunk/drivers/dma/ste_dma40.c index 486b6c0b44e3..37388d10497a 100644 --- a/trunk/drivers/dma/ste_dma40.c +++ b/trunk/drivers/dma/ste_dma40.c @@ -478,7 +478,6 @@ static struct d40_desc *d40_desc_get(struct d40_chan *d40c) list_for_each_entry_safe(d, _d, &d40c->client, node) if (async_tx_test_ack(&d->txd)) { - d40_pool_lli_free(d40c, d); d40_desc_remove(d); desc = d; memset(desc, 0, sizeof(*desc)); @@ -1209,7 +1208,6 @@ static void dma_tasklet(unsigned long data) if (!d40d->cyclic) { if (async_tx_test_ack(&d40d->txd)) { - d40_pool_lli_free(d40c, d40d); d40_desc_remove(d40d); d40_desc_free(d40c, d40d); } else { @@ -1606,7 +1604,6 @@ static int d40_free_dma(struct d40_chan *d40c) /* Release client owned descriptors */ if (!list_empty(&d40c->client)) list_for_each_entry_safe(d, _d, &d40c->client, node) { - d40_pool_lli_free(d40c, d); d40_desc_remove(d); d40_desc_free(d40c, d); }