Skip to content

Commit 87d5dd6

Browse files
author
Russell King
committed
ARM: sa1111: fix missing clk_disable()
SA1111 forgets to call clk_disable() in the probe error cleanup path. Add the necessary call. Signed-off-by: Russell King <[email protected]>
1 parent 06dfe5c commit 87d5dd6

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

arch/arm/common/sa1111.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -754,7 +754,7 @@ static int __sa1111_probe(struct device *me, struct resource *mem, int irq)
754754
if (sachip->irq != NO_IRQ) {
755755
ret = sa1111_setup_irq(sachip, pd->irq_base);
756756
if (ret)
757-
goto err_unmap;
757+
goto err_clk;
758758
}
759759

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

800800
return 0;
801801

802+
err_clk:
803+
clk_disable(sachip->clk);
802804
err_unmap:
803805
iounmap(sachip->base);
804806
err_clk_unprep:

0 commit comments

Comments
 (0)