openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

pinctrl: sunxi: disable clk when failing to probe pin controller 

Disable the clk when failing to probe the pin controller device.

Signed-off-by: Boris BREZILLON <boris.brezillon@free-electrons.com>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Boris BREZILLON 2014-04-10 15:52:41 +02:00 committed by Linus Walleij
parent 6415093f7f
commit e2bddc6a7d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/pinctrl/pinctrl-sunxi.c
View File

@ -891,7 +891,7 @@ static int sunxi_pinctrl_probe(struct platform_device *pdev)
pctl->irq = irq_of_parse_and_map(node, 0); pctl->irq = irq_of_parse_and_map(node, 0);
if (!pctl->irq) { if (!pctl->irq) {
ret = -EINVAL; ret = -EINVAL;
goto gpiochip_error; goto clk_error;
} }
pctl->domain = irq_domain_add_linear(node, SUNXI_IRQ_NUMBER, pctl->domain = irq_domain_add_linear(node, SUNXI_IRQ_NUMBER,
@ -899,7 +899,7 @@ static int sunxi_pinctrl_probe(struct platform_device *pdev)
if (!pctl->domain) { if (!pctl->domain) {
dev_err(&pdev->dev, "Couldn't register IRQ domain\n"); dev_err(&pdev->dev, "Couldn't register IRQ domain\n");
ret = -ENOMEM; ret = -ENOMEM;
goto gpiochip_error; goto clk_error;
} }
for (i = 0; i < SUNXI_IRQ_NUMBER; i++) { for (i = 0; i < SUNXI_IRQ_NUMBER; i++) {
@ -917,6 +917,8 @@ static int sunxi_pinctrl_probe(struct platform_device *pdev)
return 0; return 0;
clk_error:
clk_disable_unprepare(clk);
gpiochip_error: gpiochip_error:
if (gpiochip_remove(pctl->chip)) if (gpiochip_remove(pctl->chip))
dev_err(&pdev->dev, "failed to remove gpio chip\n"); dev_err(&pdev->dev, "failed to remove gpio chip\n");