summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-bcm
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2015-05-27 11:25:12 +0300
committerFlorian Fainelli <f.fainelli@gmail.com>2015-05-27 10:31:52 -0700
commit3cc630564e1ee9cca211ec0f14ef34cab30f21ed (patch)
treeea5682d239fe383a631993ac0e1bbf52030aba5e /arch/arm/mach-bcm
parented5cd8163da8d3e02ef83b84e42d555d40bab96a (diff)
downloadblackbird-op-linux-3cc630564e1ee9cca211ec0f14ef34cab30f21ed.tar.gz
blackbird-op-linux-3cc630564e1ee9cca211ec0f14ef34cab30f21ed.zip
ARM: BCM63xx: fix an error path in bcm63xx_pmb_power_on_cpu()
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>
Diffstat (limited to 'arch/arm/mach-bcm')
-rw-r--r--arch/arm/mach-bcm/bcm63xx_pmb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-bcm/bcm63xx_pmb.c b/arch/arm/mach-bcm/bcm63xx_pmb.c
index c39752b85b92..de061ec5a479 100644
--- 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);
OpenPOWER on IntegriCloud