* [patch -next] ARM: BCM63xx: fix an error path in bcm63xx_pmb_power_on_cpu()
@ 2015-05-27 8:25 Dan Carpenter
2015-05-27 17:33 ` Florian Fainelli
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2015-05-27 8:25 UTC (permalink / raw)
To: linux-arm-kernel
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>
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);
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [patch -next] ARM: BCM63xx: fix an error path in bcm63xx_pmb_power_on_cpu()
2015-05-27 8:25 [patch -next] ARM: BCM63xx: fix an error path in bcm63xx_pmb_power_on_cpu() Dan Carpenter
@ 2015-05-27 17:33 ` Florian Fainelli
0 siblings, 0 replies; 2+ messages in thread
From: Florian Fainelli @ 2015-05-27 17:33 UTC (permalink / raw)
To: linux-arm-kernel
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!
--
Florian
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-05-27 17:33 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-05-27 8:25 [patch -next] ARM: BCM63xx: fix an error path in bcm63xx_pmb_power_on_cpu() Dan Carpenter
2015-05-27 17:33 ` Florian Fainelli
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).