]> git.itanic.dy.fi Git - linux-stable/commitdiff
ARM: imx5: add missing put_device() call in imx_suspend_alloc_ocram()
authoryu kuai <yukuai3@huawei.com>
Thu, 4 Jun 2020 12:42:06 +0000 (20:42 +0800)
committerSasha Levin <sashal@kernel.org>
Tue, 30 Jun 2020 00:08:01 +0000 (20:08 -0400)
[ 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: 1579c7b9fe01 ("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>
arch/arm/mach-imx/pm-imx5.c

index 532d4b08276dc84c149b525e6fcc0a85d30a543b..fd996187fc5fba4bebb378d681c27e455a0f2ca9 100644 (file)
@@ -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);