ARM: socfpga: PM: add missing put_device() call in socfpga_setup_ocram_self_refresh() (3ad7b4e8) · Commits · 戴 / test

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: ("ARM: socfpga: support suspend to ram") Signed-off-by:

Yu Kuai <yukuai3@huawei.com> Signed-off-by:

Dinh Nguyen <dinguyen@kernel.org>

arch/arm/mach-socfpga/pm.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -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);

Admin message