diff mbox

[-next] ARM: BCM63xx: fix an error path in bcm63xx_pmb_power_on_cpu()

Message ID 20150527082512.GC19423@mwanda (mailing list archive)
State New, archived
Headers show

Commit Message

Dan Carpenter May 27, 2015, 8:25 a.m. UTC 
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>

Comments

Florian Fainelli May 27, 2015, 5:33 p.m. UTC | #1 
On 27/05/15 01:25, Dan Carpenter wrote:
> 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>

Applied to bcm/soc, thanks Dan!
diff mbox

Patch

diff --git a/arch/arm/mach-bcm/bcm63xx_pmb.c b/arch/arm/mach-bcm/bcm63xx_pmb.c
index c39752b..de061ec 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);