diff mbox series

ARM: imx5: add missing put_device() call in imx_suspend_alloc_ocram()

Message ID 20200604124206.3910721-1-yukuai3@huawei.com
State New
Headers show
Series ARM: imx5: add missing put_device() call in imx_suspend_alloc_ocram() | expand

Commit Message

yukuai (C) June 4, 2020, 12:42 p.m. UTC
if of_find_device_by_node() succeed, imx_suspend_alloc_ocram() doesn't
have a corresponding put_device(). Thus add a jump target to fix the
exception handling for this function implementation.

Fixes: 1579c7b9fe01 ("ARM: imx53: Set DDR pins to high impedance when in suspend to RAM.")
Signed-off-by: yu kuai <yukuai3@huawei.com>
---
 arch/arm/mach-imx/pm-imx5.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Comments

Shawn Guo June 23, 2020, 1:04 p.m. UTC | #1
On Thu, Jun 04, 2020 at 08:42:06PM +0800, yu kuai wrote:
> if of_find_device_by_node() succeed, imx_suspend_alloc_ocram() doesn't
> have a corresponding put_device(). Thus add a jump target to fix the
> exception handling for this function implementation.
> 
> Fixes: 1579c7b9fe01 ("ARM: imx53: Set DDR pins to high impedance when in suspend to RAM.")
> Signed-off-by: yu kuai <yukuai3@huawei.com>

Applied, thanks.
diff mbox series

Patch

diff --git a/arch/arm/mach-imx/pm-imx5.c b/arch/arm/mach-imx/pm-imx5.c
index f057df813f83..e9962b48e30c 100644
--- a/arch/arm/mach-imx/pm-imx5.c
+++ b/arch/arm/mach-imx/pm-imx5.c
@@ -295,14 +295,14 @@  static int __init imx_suspend_alloc_ocram(
 	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, size);
 	if (!ocram_base) {
 		pr_warn("%s: unable to alloc ocram!\n", __func__);
 		ret = -ENOMEM;
-		goto put_node;
+		goto put_device;
 	}
 
 	phys = gen_pool_virt_to_phys(ocram_pool, ocram_base);
@@ -312,6 +312,8 @@  static int __init imx_suspend_alloc_ocram(
 	if (virt_out)
 		*virt_out = virt;
 
+put_device:
+	put_device(&pdev->dev);
 put_node:
 	of_node_put(node);