diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2016-09-06 17:09:17 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2016-09-12 12:04:05 +0200 |
| commit | 87d5dd62c07f90ed2b0d6718f5c666f69e7d39b0 (patch) | |
| tree | dc3556dd00d097d86a69a6a46b8d5fabcf9bdf15 /arch | |
| parent | ARM: sa1111: fix pcmcia suspend/resume (diff) | |
| download | linux-87d5dd62c07f90ed2b0d6718f5c666f69e7d39b0.tar.xz linux-87d5dd62c07f90ed2b0d6718f5c666f69e7d39b0.zip | |
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 <rmk+kernel@armlinux.org.uk>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/common/sa1111.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c index 7838659b870a..2e076c492005 100644 --- a/arch/arm/common/sa1111.c +++ b/arch/arm/common/sa1111.c @@ -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: |