From: Per Forlin <per.forlin@linaro.org>
To: linux-kernel@vger.kernel.org,
Linus Walleij <linus.walleij@linaro.org>,
Rabin Vincent <rabin.vincent@stericsson.com>
Cc: Vinod Koul <vinod.koul@intel.com>,
linaro-dev@lists.linaro.org, Per Forlin <per.forlin@linaro.org>
Subject: [PATCH 2/4] dmaengine/ste_dma40: remove duplicate call to d40_pool_lli_free().
Date: Mon, 29 Aug 2011 13:33:33 +0200 [thread overview]
Message-ID: <1314617615-2394-3-git-send-email-per.forlin@linaro.org> (raw)
In-Reply-To: <1314617615-2394-1-git-send-email-per.forlin@linaro.org>
d40_desc_free() already calls d40_pool_lli_free().
Signed-off-by: Per Forlin <per.forlin@linaro.org>
---
drivers/dma/ste_dma40.c | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c
index 486b6c0..37388d1 100644
--- a/drivers/dma/ste_dma40.c
+++ b/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);
}
--
1.7.4.1
next prev parent reply other threads:[~2011-08-29 11:34 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-29 11:33 [PATCH 0/4] dmaeninge/ste_dma40: bug fixes for 3.1 Per Forlin
2011-08-29 11:33 ` [PATCH 1/4] dmaengine/ste_dma40: add missing kernel doc for pending_queue Per Forlin
2011-08-29 11:33 ` Per Forlin [this message]
2011-08-29 11:33 ` [PATCH 3/4] dmaengine/ste_dma40: fix Oops due to double free of client descriptor Per Forlin
2011-08-29 11:33 ` [PATCH 4/4] dmaengine/ste_dma40: fix memory leak due to prepared descriptors Per Forlin
2011-08-29 12:17 ` [PATCH 0/4] dmaeninge/ste_dma40: bug fixes for 3.1 Linus Walleij
2011-09-02 11:27 ` Vinod Koul
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1314617615-2394-3-git-send-email-per.forlin@linaro.org \
--to=per.forlin@linaro.org \
--cc=linaro-dev@lists.linaro.org \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rabin.vincent@stericsson.com \
--cc=vinod.koul@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®