Commit f5e4ce48 authored Jun 04, 2020 by yu kuai Committed by Sasha Levin Jun 30, 2020

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



[ Upstream commit 586745f1598ccf71b0a5a6df2222dee0a865954e ]

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: 1579c7b9 ("ARM: imx53: Set DDR pins to high impedance when in suspend to RAM.")
Signed-off-by: yu kuai <yukuai3@huawei.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 10ecd234

arch/arm/mach-imx/pm-imx5.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -301,14 +301,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);
		@@ -318,6 +318,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);