[PATCH 4.11 65/84] ARM: davinci: PM: Do not free useful resources in normal path in davinci_pm_init

Greg Kroah-Hartman
2017-07-03T13:49:16Z

From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

commit 95d7c1f18bf8ac03b0fc48eac1f1b11f867765b8 upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
arch/arm/mach-davinci/pm.c | 2 ++
1 file changed, 2 insertions(+)

--- a/arch/arm/mach-davinci/pm.c
+++ b/arch/arm/mach-davinci/pm.c
@@ -163,6 +163,8 @@ int __init davinci_pm_init(void)

suspend_set_ops(&davinci_pm_ops);

+ return 0;
+
no_sram_mem:
iounmap(pm_config.ddrpsc_reg_base);