summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>2017-05-13 13:40:20 +0200
committerSekhar Nori <nsekhar@ti.com>2017-05-17 15:25:18 +0530
commit95d7c1f18bf8ac03b0fc48eac1f1b11f867765b8 (patch)
tree366c0ab34b29a53e14f8e4bf1bf955395eb0bcc4 /arch/arm
parentf3f6cc814f9cb61cfb738af2b126a8bf19e5ab4c (diff)
ARM: davinci: PM: Do not free useful resources in normal path in 'davinci_pm_init'
It is wrong to iounmap resources in the normal path of davinci_pm_init() The 3 ioremap'ed fields of 'pm_config' can be accessed later on in other functions, so we should return 'success' instead of unrolling everything. Fixes: aa9aa1ec2df6 ("ARM: davinci: PM: rework init, remove platform device") Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> [nsekhar@ti.com: commit message and minor style fixes] Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-davinci/pm.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-davinci/pm.c b/arch/arm/mach-davinci/pm.c
index d282b0783ecf..b5cc05dc2cb2 100644
--- a/arch/arm/mach-davinci/pm.c
+++ b/arch/arm/mach-davinci/pm.c
@@ -162,6 +162,8 @@ int __init davinci_pm_init(void)
suspend_set_ops(&davinci_pm_ops);
+ return 0;
+
no_sram_mem:
iounmap(pm_config.ddrpsc_reg_base);
no_ddrpsc_mem: