Skip to contentSkip to conversation

ARM: BCM63xx: fix an error path in bcm63xx_pmb_power_on_cpu()

PATCH Applied Dan Carpenter 2 participants 2 messages May 27, 2015

Subsystems (4)
Arm (32-bit) Arm sub-architectures Kernel janitors Broadcom BCM281XX/BCM11XXX/BCM216XX Arm architecture
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
arch/arm/mach-bcm/bcm63xx_pmb.c +1 -1
index c39752b..de061ec 100644
@@ -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);
Applied
#1 lore raw
Quoted 4 lines · Dan Carpenter

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 <[email protected]>

Applied to bcm/soc, thanks Dan!

Signature · 1 line
Florian