summaryrefslogtreecommitdiffstats
path: root/drivers/soc
diff options
context:
space:
mode:
authorYang Yingliang <yangyingliang@huawei.com>2021-08-25 09:42:14 +0930
committerArnd Bergmann <arnd@arndb.de>2021-08-26 11:31:22 +0200
commit51e321fed0ff8d64eff809a4ee0547254cdcc4a1 (patch)
tree331ede2c00d3ed7efd8f1ec9a3444b08fd16fc86 /drivers/soc
parent9664efeb5b869bbe6bf932b0957e9faaaaf6af5a (diff)
downloadlinux-stable-51e321fed0ff8d64eff809a4ee0547254cdcc4a1.tar.gz
linux-stable-51e321fed0ff8d64eff809a4ee0547254cdcc4a1.tar.bz2
linux-stable-51e321fed0ff8d64eff809a4ee0547254cdcc4a1.zip
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: 2f9b25fa6682 ("soc: aspeed: Re-enable FWH2AHB on AST2600") Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> Signed-off-by: Joel Stanley <joel@jms.id.au> Reviewed-by: Joel 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: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/soc')
-rw-r--r--drivers/soc/aspeed/aspeed-lpc-ctrl.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/soc/aspeed/aspeed-lpc-ctrl.c b/drivers/soc/aspeed/aspeed-lpc-ctrl.c
index 6893c5ec3259..72771e018c42 100644
--- a/drivers/soc/aspeed/aspeed-lpc-ctrl.c
+++ b/drivers/soc/aspeed/aspeed-lpc-ctrl.c
@@ -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;