lkml.org 
[lkml]   [2020]   [Jun]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH] ARM: at91: pm: add missing put_device() call in at91_pm_sram_init()
From
Date
ping?

On 2020/6/4 20:33, yu kuai wrote:
> if of_find_device_by_node() succeed, at91_pm_sram_init() doesn't have
> a corresponding put_device(). Thus add a jump target to fix the exception
> handling for this function implementation.
>
> Fixes: d2e467905596 ("ARM: at91: pm: use the mmio-sram pool to access SRAM")
> Signed-off-by: yu kuai <yukuai3@huawei.com>
> ---
> arch/arm/mach-at91/pm.c | 11 ++++++++---
> 1 file changed, 8 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
> index 074bde64064e..2aab043441e8 100644
> --- a/arch/arm/mach-at91/pm.c
> +++ b/arch/arm/mach-at91/pm.c
> @@ -592,13 +592,13 @@ static void __init at91_pm_sram_init(void)
> sram_pool = gen_pool_get(&pdev->dev, NULL);
> if (!sram_pool) {
> pr_warn("%s: sram pool unavailable!\n", __func__);
> - return;
> + goto out_put_device;
> }
>
> sram_base = gen_pool_alloc(sram_pool, at91_pm_suspend_in_sram_sz);
> if (!sram_base) {
> pr_warn("%s: unable to alloc sram!\n", __func__);
> - return;
> + goto out_put_device;
> }
>
> sram_pbase = gen_pool_virt_to_phys(sram_pool, sram_base);
> @@ -606,12 +606,17 @@ static void __init at91_pm_sram_init(void)
> at91_pm_suspend_in_sram_sz, false);
> if (!at91_suspend_sram_fn) {
> pr_warn("SRAM: Could not map\n");
> - return;
> + goto out_put_device;
> }
>
> /* Copy the pm suspend handler to SRAM */
> at91_suspend_sram_fn = fncpy(at91_suspend_sram_fn,
> &at91_pm_suspend_in_sram, at91_pm_suspend_in_sram_sz);
> + return;
> +
> +out_put_device:
> + put_device(&pdev->dev);
> + return;
> }
>
> static bool __init at91_is_pm_mode_active(int pm_mode)
>

\
 
 \ /
  Last update: 2020-06-24 10:47    [W:0.071 / U:0.020 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site