From: Dinh Nguyen <dinguyen@kernel.org>
To: Yu Kuai <yukuai3@huawei.com>,
linux@armlinux.org.uk, atull@opensource.altera.com,
khilman@linaro.org
Cc: linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, yi.zhang@huawei.com
Subject: Re: [PATCH] ARM: socfpga: PM: add missing put_device() call in socfpga_setup_ocram_self_refresh()
Date: Tue, 28 Jul 2020 14:18:04 -0500 [thread overview]
Message-ID: <8d06f69f-6560-aa98-ff12-004e77a26f01@kernel.org> (raw)
In-Reply-To: <20200721134551.1276641-1-yukuai3@huawei.com>
On 7/21/20 8:45 AM, Yu Kuai wrote:
> if of_find_device_by_node() succeed, socfpga_setup_ocram_self_refresh
> doesn't have a corresponding put_device(). Thus add a jump target to
> fix the exception handling for this function implementation.
>
> Fixes: 44fd8c7d4005 ("ARM: socfpga: support suspend to ram")
> Signed-off-by: Yu Kuai <yukuai3@huawei.com>
> ---
> arch/arm/mach-socfpga/pm.c | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/mach-socfpga/pm.c b/arch/arm/mach-socfpga/pm.c
> index 6ed887cf8dc9..365c0428b21b 100644
> --- a/arch/arm/mach-socfpga/pm.c
> +++ b/arch/arm/mach-socfpga/pm.c
> @@ -49,14 +49,14 @@ static int socfpga_setup_ocram_self_refresh(void)
> if (!ocram_pool) {
> pr_warn("%s: ocram pool unavailable!\n", __func__);
> ret = -ENODEV;
> - goto put_node;
> + goto put_device;
> }
>
> ocram_base = gen_pool_alloc(ocram_pool, socfpga_sdram_self_refresh_sz);
> if (!ocram_base) {
> pr_warn("%s: unable to alloc ocram!\n", __func__);
> ret = -ENOMEM;
> - goto put_node;
> + goto put_device;
> }
>
> ocram_pbase = gen_pool_virt_to_phys(ocram_pool, ocram_base);
> @@ -67,7 +67,7 @@ static int socfpga_setup_ocram_self_refresh(void)
> if (!suspend_ocram_base) {
> pr_warn("%s: __arm_ioremap_exec failed!\n", __func__);
> ret = -ENOMEM;
> - goto put_node;
> + goto put_device;
> }
>
> /* Copy the code that puts DDR in self refresh to ocram */
> @@ -81,6 +81,8 @@ static int socfpga_setup_ocram_self_refresh(void)
> if (!socfpga_sdram_self_refresh_in_ocram)
> ret = -EFAULT;
>
> +put_device:
> + put_device(&pdev->dev);
> put_node:
> of_node_put(np);
>
>
Applied!
Thanks,
Dinh
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-07-28 19:19 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-21 13:45 [PATCH] ARM: socfpga: PM: add missing put_device() call in socfpga_setup_ocram_self_refresh() Yu Kuai
2020-07-28 19:18 ` Dinh Nguyen [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-11-09 18:01 [PATCH] ARM: socfpga: PM: Add " Markus Elfring
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=8d06f69f-6560-aa98-ff12-004e77a26f01@kernel.org \
--to=dinguyen@kernel.org \
--cc=atull@opensource.altera.com \
--cc=khilman@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=yi.zhang@huawei.com \
--cc=yukuai3@huawei.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).