projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ed5cd81)
ARM: BCM63xx: fix an error path in bcm63xx_pmb_power_on_cpu()
authorDan Carpenter <dan.carpenter@oracle.com>
Wed, 27 May 2015 08:25:12 +0000 (11:25 +0300)
committerFlorian Fainelli <f.fainelli@gmail.com>
Wed, 27 May 2015 17:31:52 +0000 (10:31 -0700)
We need to unlock and unmap some resourses before returning.

Fixes: 3f2a43c98d72 ('ARM: BCM63xx: Add secondary CPU PMB initialization sequence')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
arch/arm/mach-bcm/bcm63xx_pmb.c patch | blob | blame | history

diff --git a/arch/arm/mach-bcm/bcm63xx_pmb.c b/arch/arm/mach-bcm/bcm63xx_pmb.c
index c39752b85b92ad2cb6f96a5ba1513c8b8f243fd3..de061ec5a47964c99cba838bac515fba48b475eb 100644 (file)
--- a/arch/arm/mach-bcm/bcm63xx_pmb.c
+++ b/arch/arm/mach-bcm/bcm63xx_pmb.c
@@ -150,7 +150,7 @@ int bcm63xx_pmb_power_on_cpu(struct device_node *dn)
         */
        ret = bpcm_rd(base, addr, ARM_CONTROL, &ctrl);
        if (ret)
-               return ret;
+               goto out;
 
        if (ctrl & CPU_RESET_N(cpu)) {
                pr_info("PMB: CPU%d is already powered on\n", cpu);