Unverified Commit 51e321fe authored by Yang Yingliang's avatar Yang Yingliang Committed by Arnd Bergmann
Browse files

soc: aspeed-lpc-ctrl: Fix clock cleanup in error path 



Move syscon_regmap_lookup_by_compatible() above the
devm_clk_get() to avoid missing clk_disable_unprepare().

Fixes: 2f9b25fa ("soc: aspeed: Re-enable FWH2AHB on AST2600")
Reported-by: default avatarHulk Robot <hulkci@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarJoel Stanley <joel@jms.id.au>
Reviewed-by: default avatarJoel Stanley <joel@jms.id.au>
Link: https://lore.kernel.org/r/20210824085522.1849410-1-yangyingliang@huawei.com
Link: https://lore.kernel.org/r/20210825001214.3056193-1-joel@jms.id.au

'
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 9664efeb

drivers/soc/aspeed/aspeed-lpc-ctrl.c

+10 −10
Original line number Diff line number Diff line
@@ -295,6 +295,16 @@ static int aspeed_lpc_ctrl_probe(struct platform_device *pdev) 
		return -ENODEV;

	}



	if (of_device_is_compatible(dev->of_node, "aspeed,ast2600-lpc-ctrl")) {

		lpc_ctrl->fwh2ahb = true;



		lpc_ctrl->scu = syscon_regmap_lookup_by_compatible("aspeed,ast2600-scu");

		if (IS_ERR(lpc_ctrl->scu)) {

			dev_err(dev, "couldn't find scu\n");

			return PTR_ERR(lpc_ctrl->scu);

		}

	}



	lpc_ctrl->clk = devm_clk_get(dev, NULL);

	if (IS_ERR(lpc_ctrl->clk)) {

		dev_err(dev, "couldn't get clock\n");
@@ -306,16 +316,6 @@ static int aspeed_lpc_ctrl_probe(struct platform_device *pdev) 
		return rc;

	}



	if (of_device_is_compatible(dev->of_node, "aspeed,ast2600-lpc-ctrl")) {

		lpc_ctrl->fwh2ahb = true;



		lpc_ctrl->scu = syscon_regmap_lookup_by_compatible("aspeed,ast2600-scu");

		if (IS_ERR(lpc_ctrl->scu)) {

			dev_err(dev, "couldn't find scu\n");

			return PTR_ERR(lpc_ctrl->scu);

		}

	}



	lpc_ctrl->miscdev.minor = MISC_DYNAMIC_MINOR;

	lpc_ctrl->miscdev.name = DEVICE_NAME;

	lpc_ctrl->miscdev.fops = &aspeed_lpc_ctrl_fops;