| From 2de5ed003f976ca22e3a3caedee9a772dd252ff3 Mon Sep 17 00:00:00 2001 |
| From: Yu Kuai <yukuai3@huawei.com> |
| Date: Tue, 21 Jul 2020 21:45:51 +0800 |
| Subject: [PATCH] ARM: socfpga: PM: add missing put_device() call in |
| socfpga_setup_ocram_self_refresh() |
| |
| commit 3ad7b4e8f89d6bcc9887ca701cf2745a6aedb1a0 upstream. |
| |
| if of_find_device_by_node() succeed, socfpga_setup_ocram_self_refresh |
| doesn't have a corresponding put_device(). Thus add a jump target to |
| fix the exception handling for this function implementation. |
| |
| Fixes: 44fd8c7d4005 ("ARM: socfpga: support suspend to ram") |
| Signed-off-by: Yu Kuai <yukuai3@huawei.com> |
| Signed-off-by: Dinh Nguyen <dinguyen@kernel.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/arch/arm/mach-socfpga/pm.c b/arch/arm/mach-socfpga/pm.c |
| index 6ed887cf8dc9..365c0428b21b 100644 |
| --- a/arch/arm/mach-socfpga/pm.c |
| +++ b/arch/arm/mach-socfpga/pm.c |
| @@ -49,14 +49,14 @@ static int socfpga_setup_ocram_self_refresh(void) |
| 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, socfpga_sdram_self_refresh_sz); |
| if (!ocram_base) { |
| pr_warn("%s: unable to alloc ocram!\n", __func__); |
| ret = -ENOMEM; |
| - goto put_node; |
| + goto put_device; |
| } |
| |
| ocram_pbase = gen_pool_virt_to_phys(ocram_pool, ocram_base); |
| @@ -67,7 +67,7 @@ static int socfpga_setup_ocram_self_refresh(void) |
| if (!suspend_ocram_base) { |
| pr_warn("%s: __arm_ioremap_exec failed!\n", __func__); |
| ret = -ENOMEM; |
| - goto put_node; |
| + goto put_device; |
| } |
| |
| /* Copy the code that puts DDR in self refresh to ocram */ |
| @@ -81,6 +81,8 @@ static int socfpga_setup_ocram_self_refresh(void) |
| if (!socfpga_sdram_self_refresh_in_ocram) |
| ret = -EFAULT; |
| |
| +put_device: |
| + put_device(&pdev->dev); |
| put_node: |
| of_node_put(np); |
| |
| -- |
| 2.27.0 |
| |
