summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authoryu kuai <yukuai3@huawei.com>2020-06-04 14:42:06 +0200
committerShawn Guo <shawnguo@kernel.org>2020-06-24 03:24:34 +0200
commit586745f1598ccf71b0a5a6df2222dee0a865954e (patch)
treeeed34ea24e8d4eb0fbf94539a4f24a429b87837e /arch/arm
parentsoc: imx8m: Correct i.MX8MP UID fuse offset (diff)
downloadlinux-586745f1598ccf71b0a5a6df2222dee0a865954e.tar.xz
linux-586745f1598ccf71b0a5a6df2222dee0a865954e.zip
ARM: imx5: add missing put_device() call in imx_suspend_alloc_ocram()
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>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-imx/pm-imx5.c6
1 files changed, 4 insertions, 2 deletions
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);