diff options
| author | yu kuai <yukuai3@huawei.com> | 2020-06-04 20:42:06 +0800 |
|---|---|---|
| committer | Sasha Levin <sashal@kernel.org> | 2020-06-30 15:38:05 -0400 |
| commit | 9be0376a05b0a80ad073773ad47dbe7f5d5e622f (patch) | |
| tree | c42d6882766be07f6f5c1c87dee48ead1d49f37c /arch/arm | |
| parent | 24495b2bcd0bf49d195481073932d23e9b737005 (diff) | |
| download | linux-stable-9be0376a05b0a80ad073773ad47dbe7f5d5e622f.tar.gz linux-stable-9be0376a05b0a80ad073773ad47dbe7f5d5e622f.tar.bz2 linux-stable-9be0376a05b0a80ad073773ad47dbe7f5d5e622f.zip | |
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: 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>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-imx/pm-imx5.c | 6 |
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 868781fd460c..14c630c899c5 100644 --- a/arch/arm/mach-imx/pm-imx5.c +++ b/arch/arm/mach-imx/pm-imx5.c @@ -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); |