Re: [PATCH] ARM: socfpga: add missing put_device() call in socfpga_setup_ocram_self_refresh()

[yukuai (C)]

ping?

On 2020/6/4 21:10, 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 <yuku...@huawei.com>
---
  arch/arm/mach-socfpga/pm.c | 11 ++++++++---
  1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-socfpga/pm.c b/arch/arm/mach-socfpga/pm.c
index 6ed887cf8dc9..7267f5da15a4 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 */

@@ -80,7 +80,12 @@ static int socfpga_setup_ocram_self_refresh(void)
             "could not copy function to ocram");
        if (!socfpga_sdram_self_refresh_in_ocram)
                ret = -EFAULT;
+
+       if (!ret)
+               goto put_node;

+put_device:

+       put_device(&pdev->dev);
  put_node:
        of_node_put(np);