From: Daniel Mack <daniel@zonque.org>
To: Miaoqian Lin <linmq006@gmail.com>
Cc: Haojian Zhuang <haojian.zhuang@gmail.com>,
Robert Jarzmik <robert.jarzmik@free.fr>,
Russell King <linux@armlinux.org.uk>,
Marc Zyngier <marc.zyngier@altran.com>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] ARM: pxa: Fix error handling in viper_tpm_init
Date: Mon, 27 Dec 2021 16:34:51 +0100 [thread overview]
Message-ID: <b4a94938-9443-14e8-af86-229f61970657@zonque.org> (raw)
In-Reply-To: <20211227125154.3145-1-linmq006@gmail.com>
Hi,
On 27/12/2021 13:51, Miaoqian Lin wrote:
> tpm_device get by platform_device_alloc(), which calls device_initialize.
> Call platform_device_put(tpm_device) instead of kfree(tmp_device) to
> prevent memory leak.
While this seems correct, I don't think we should make any effort to
maintain legacy board support files but rather move to DTS instead.
Robert and I laid the foundation and ported a few machines a while ago,
but I was reluctant to touch the board support code I can't test on real
hardware.
As you seem to have access to a Viper board, could you have a look at
the existing device-tree ported PXA machines and see if you can follow
suit here please?
Thanks,
Daniel
>
> Fixes: 352699a ("Basic support for the Arcom/Eurotech Viper SBC.")
> Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
> ---
> arch/arm/mach-pxa/viper.c | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/mach-pxa/viper.c b/arch/arm/mach-pxa/viper.c
> index 3aa34e9a15d3..9a0f184dbecb 100644
> --- a/arch/arm/mach-pxa/viper.c
> +++ b/arch/arm/mach-pxa/viper.c
> @@ -815,11 +815,11 @@ static void __init viper_tpm_init(void)
> sizeof(i2c_tpm_data))) {
> if (platform_device_add(tpm_device)) {
> errstr = "register TPM i2c bus";
> - goto error_free_tpm;
> + goto exit_put_device;
> }
> } else {
> errstr = "allocate TPM i2c bus data";
> - goto error_free_tpm;
> + goto exit_put_device;
> }
> } else {
> errstr = "allocate TPM i2c device";
> @@ -827,9 +827,8 @@ static void __init viper_tpm_init(void)
> }
>
> return;
> -
> -error_free_tpm:
> - kfree(tpm_device);
> +exit_put_device:
> + platform_device_put(tpm_device);
> error_tpm:
> pr_err("viper: Couldn't %s, giving up\n", errstr);
> }
prev parent reply other threads:[~2021-12-27 15:46 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-27 12:51 [PATCH] ARM: pxa: Fix error handling in viper_tpm_init Miaoqian Lin
2021-12-27 15:34 ` Daniel Mack [this message]
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=b4a94938-9443-14e8-af86-229f61970657@zonque.org \
--to=daniel@zonque.org \
--cc=haojian.zhuang@gmail.com \
--cc=linmq006@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=marc.zyngier@altran.com \
--cc=robert.jarzmik@free.fr \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).