From: Vinod Koul <vkoul@infradead.org>
To: Inderpal Singh <inderpal.singh@linaro.org>
Cc: vinod.koul@intel.com, linux-samsung-soc@vger.kernel.org,
linux-kernel@vger.kernel.org, jassisinghbrar@gmail.com,
boojin.kim@samsung.com, patches@linaro.org,
kgene.kim@samsung.com
Subject: Re: [PATCH v2 1/4] DMA: PL330: Free memory allocated for peripheral channels
Date: Wed, 24 Oct 2012 09:35:50 +0530 [thread overview]
Message-ID: <1351051550.5263.15.camel@vkoul-udesk3> (raw)
In-Reply-To: <1349432276-22919-2-git-send-email-inderpal.singh@linaro.org>
On Fri, 2012-10-05 at 15:47 +0530, Inderpal Singh wrote:
> 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;
This looks fine, but if you use devm_ functions then you dont need to do
all this.
Can you do that conversion instead?
--
Vinod Koul
Intel Corp.
next prev parent reply other threads:[~2012-10-24 5:06 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-05 10:17 [PATCH v2 0/4] DMA: PL330: Fix mem leaks and balance probe/remove Inderpal Singh
2012-10-05 10:17 ` [PATCH v2 1/4] DMA: PL330: Free memory allocated for peripheral channels Inderpal Singh
2012-10-24 4:05 ` Vinod Koul [this message]
2012-10-25 10:59 ` Inderpal Singh
2012-10-05 10:17 ` [PATCH v2 2/4] DMA: PL330: Change allocation method to properly free DMA descriptors Inderpal Singh
2012-10-24 4:10 ` Vinod Koul
2012-10-25 11:02 ` Inderpal Singh
2012-10-05 10:17 ` [PATCH v2 3/4] DMA: PL330: Balance module remove function with probe Inderpal Singh
2012-10-24 4:14 ` Vinod Koul
2012-10-25 11:23 ` Inderpal Singh
2012-10-26 4:45 ` Vinod Koul
2012-10-27 10:20 ` Inderpal Singh
2012-10-29 4:45 ` Vinod Koul
2012-10-29 9:00 ` Inderpal Singh
2012-10-05 10:17 ` [PATCH v2 4/4] DMA: PL330: unregister dma_device in module's remove function Inderpal Singh
2012-10-24 4:19 ` Vinod Koul
2012-10-25 11:05 ` Inderpal Singh
2012-10-12 4:33 ` [PATCH v2 0/4] DMA: PL330: Fix mem leaks and balance probe/remove Inderpal Singh
2012-10-13 11:03 ` Jassi Brar
2012-10-16 11:32 ` 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=1351051550.5263.15.camel@vkoul-udesk3 \
--to=vkoul@infradead.org \
--cc=boojin.kim@samsung.com \
--cc=inderpal.singh@linaro.org \
--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).