ARM: socfpga: PM: Add missing put_device() call in socfpga_setup_ocram_self_refresh()

Commit Message

Markus Elfring Nov. 9, 2019, 6:01 p.m. UTC

From: Markus Elfring <[e-mail]>
Date: Sat, 9 Nov 2019 18:48:44 +0100

A coccicheck run provided information like the following.

arch/arm/mach-socfpga/pm.c:87:1-7: ERROR: missing put_device;
call of_find_device_by_node on line 41, but without a corresponding
object release within this function.

Generated by: scripts/coccinelle/free/put_device.cocci

Thus add the missed function call to fix the resource management for
this function implementation.

Fixes: 44fd8c7d4005f660f48679439f0a54225ba234a4 ("ARM: socfpga: support suspend to ram")
Signed-off-by: Markus Elfring <[e-mail]>
---
 arch/arm/mach-socfpga/pm.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

--
2.24.0

Patch

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);