Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9634cd8e authored by yu kuai's avatar yu kuai Committed by Greg Kroah-Hartman
Browse files

ARM: imx6: add missing put_device() call in imx6q_suspend_init() 



[ Upstream commit 4845446036fc9c13f43b54a65c9b757c14f5141b ]

if of_find_device_by_node() succeed, imx6q_suspend_init() doesn't have a
corresponding put_device(). Thus add a jump target to fix the exception
handling for this function implementation.

Signed-off-by: default avataryu kuai <yukuai3@huawei.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 38bcc785

arch/arm/mach-imx/pm-imx6.c

+6 −4
Original line number Diff line number Diff line
@@ -497,14 +497,14 @@ static int __init imx6q_suspend_init(const struct imx6_pm_socdata *socdata) 
	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, MX6Q_SUSPEND_OCRAM_SIZE);

	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);
@@ -527,7 +527,7 @@ static int __init imx6q_suspend_init(const struct imx6_pm_socdata *socdata) 
	ret = imx6_pm_get_base(&pm_info->mmdc_base, socdata->mmdc_compat);

	if (ret) {

		pr_warn("%s: failed to get mmdc base %d!\n", __func__, ret);

		goto put_node;

		goto put_device;

	}



	ret = imx6_pm_get_base(&pm_info->src_base, socdata->src_compat);
@@ -574,7 +574,7 @@ static int __init imx6q_suspend_init(const struct imx6_pm_socdata *socdata) 
		&imx6_suspend,

		MX6Q_SUSPEND_OCRAM_SIZE - sizeof(*pm_info));



	goto put_node;

	goto put_device;



pl310_cache_map_failed:

	iounmap(pm_info->gpc_base.vbase);
@@ -584,6 +584,8 @@ static int __init imx6q_suspend_init(const struct imx6_pm_socdata *socdata) 
	iounmap(pm_info->src_base.vbase);

src_map_failed:

	iounmap(pm_info->mmdc_base.vbase);

put_device:

	put_device(&pdev->dev);

put_node:

	of_node_put(node);