Skip to content

Commit

Permalink
ARM: sa1111: fix missing clk_disable()
Browse files Browse the repository at this point in the history
SA1111 forgets to call clk_disable() in the probe error cleanup path.
Add the necessary call.

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
  • Loading branch information
Russell King committed Sep 12, 2016
1 parent 06dfe5c commit 87d5dd6
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion arch/arm/common/sa1111.c
Original file line number Diff line number Diff line change
Expand Up @@ -754,7 +754,7 @@ static int __sa1111_probe(struct device *me, struct resource *mem, int irq)
if (sachip->irq != NO_IRQ) {
ret = sa1111_setup_irq(sachip, pd->irq_base);
if (ret)
goto err_unmap;
goto err_clk;
}

#ifdef CONFIG_ARCH_SA1100
Expand Down Expand Up @@ -799,6 +799,8 @@ static int __sa1111_probe(struct device *me, struct resource *mem, int irq)

return 0;

err_clk:
clk_disable(sachip->clk);
err_unmap:
iounmap(sachip->base);
err_clk_unprep:
Expand Down

0 comments on commit 87d5dd6

Please sign in to comment.