]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
ARM: sa1111: fix missing clk_disable()
authorRussell King <rmk+kernel@armlinux.org.uk>
Tue, 6 Sep 2016 15:09:17 +0000 (16:09 +0100)
committerRussell King <rmk+kernel@armlinux.org.uk>
Mon, 12 Sep 2016 10:04:05 +0000 (11:04 +0100)
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>
arch/arm/common/sa1111.c

index 7838659b870a984ed0f7446898e9a53ab58e5844..2e076c492005b57b5ce978fc87b03e1c2292b41b 100644 (file)
@@ -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
@@ -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: