From: Inderpal Singh <inderpal.singh@linaro.org>
To: linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: jassisinghbrar@gmail.com, boojin.kim@samsung.com,
vinod.koul@intel.com, patches@linaro.org, kgene.kim@samsung.com
Subject: [PATCH 1/3] DMA: PL330: Free memory allocated for peripheral channels
Date: Tue, 25 Sep 2012 14:27:34 +0530 [thread overview]
Message-ID: <1348563456-30569-2-git-send-email-inderpal.singh@linaro.org> (raw)
In-Reply-To: <1348563456-30569-1-git-send-email-inderpal.singh@linaro.org>
The allocated memory for peripheral channels is not being freed upon
failure in probe and in module's remove funtion. It will lead to memory
leakage. Hence free the allocated memory.
Signed-off-by: Inderpal Singh <inderpal.singh@linaro.org>
---
drivers/dma/pl330.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
index 2ebd4cd..10c6b6a 100644
--- a/drivers/dma/pl330.c
+++ b/drivers/dma/pl330.c
@@ -2962,7 +2962,7 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id)
ret = dma_async_device_register(pd);
if (ret) {
dev_err(&adev->dev, "unable to register DMAC\n");
- goto probe_err4;
+ goto probe_err5;
}
dev_info(&adev->dev,
@@ -2975,6 +2975,8 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id)
return 0;
+probe_err5:
+ kfree(pdmac->peripherals);
probe_err4:
pl330_del(pi);
probe_err3:
@@ -3025,6 +3027,7 @@ static int __devexit pl330_remove(struct amba_device *adev)
res = &adev->res;
release_mem_region(res->start, resource_size(res));
+ kfree(pdmac->peripherals);
kfree(pdmac);
return 0;
--
1.7.9.5
next prev parent reply other threads:[~2012-09-25 8:57 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-25 8:57 [PATCH 0/3] DMA: PL330: Fix mem leaks and balance probe/remove Inderpal Singh
2012-09-25 8:57 ` Inderpal Singh [this message]
2012-09-25 12:47 ` [PATCH 1/3] DMA: PL330: Free memory allocated for peripheral channels Jassi Brar
2012-09-25 15:23 ` Inderpal Singh
2012-09-25 8:57 ` [PATCH 2/3] DMA: PL330: Change allocation method to properly free DMA descriptors Inderpal Singh
2012-09-25 13:09 ` Jassi Brar
2012-09-25 15:26 ` Inderpal Singh
2012-09-25 8:57 ` [PATCH 3/3] DMA: PL330: Balance module remove function with probe Inderpal Singh
2012-09-25 13:17 ` Jassi Brar
2012-09-26 6:41 ` Inderpal Singh
2012-09-26 9:32 ` Jassi Brar
2012-09-26 10:55 ` Inderpal Singh
2012-09-26 16:49 ` Jassi Brar
2012-09-27 4:13 ` Inderpal Singh
2012-09-27 5:05 ` Jassi Brar
2012-09-27 5:30 ` Inderpal Singh
2012-09-27 6:03 ` Jassi Brar
2012-09-27 9:48 ` Vinod Koul
2012-09-27 15:41 ` Inderpal Singh
2012-09-27 16:06 ` Jassi Brar
2012-09-28 4:33 ` Inderpal Singh
2012-09-28 10:58 ` Jassi Brar
2012-10-01 9:59 ` Inderpal Singh
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=1348563456-30569-2-git-send-email-inderpal.singh@linaro.org \
--to=inderpal.singh@linaro.org \
--cc=boojin.kim@samsung.com \
--cc=jassisinghbrar@gmail.com \
--cc=kgene.kim@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=patches@linaro.org \
--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;
as well as URLs for NNTP newsgroup(s).