Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1640887 > unrolled thread
| Started by | Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
|---|---|
| First post | 2017-05-13 13:50 +0200 |
| Last post | 2017-05-17 11:30 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH 1/2] ARM: davinci: PM: Free resources in error handling path in 'davinci_pm_init' Christophe JAILLET <christophe.jaillet@wanadoo.fr> - 2017-05-13 13:50 +0200
Re: [PATCH 1/2] ARM: davinci: PM: Free resources in error handling path in 'davinci_pm_init' Sekhar Nori <nsekhar@ti.com> - 2017-05-17 11:30 +0200
| From | Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
|---|---|
| Date | 2017-05-13 13:50 +0200 |
| Subject | [PATCH 1/2] ARM: davinci: PM: Free resources in error handling path in 'davinci_pm_init' |
| Message-ID | <tGDIC-35B-17@gated-at.bofh.it> |
If 'sram_alloc' fails, we need to free already allocated resources.
Fixes: aa9aa1ec2df6 ("ARM: davinci: PM: rework init, remove platform device")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
arch/arm/mach-davinci/pm.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-davinci/pm.c b/arch/arm/mach-davinci/pm.c
index efb80354f303..d282b0783ecf 100644
--- a/arch/arm/mach-davinci/pm.c
+++ b/arch/arm/mach-davinci/pm.c
@@ -153,7 +153,8 @@ int __init davinci_pm_init(void)
davinci_sram_suspend = sram_alloc(davinci_cpu_suspend_sz, NULL);
if (!davinci_sram_suspend) {
pr_err("PM: cannot allocate SRAM memory\n");
- return -ENOMEM;
+ ret = -ENOMEM;
+ goto no_sram_mem;
}
davinci_sram_push(davinci_sram_suspend, davinci_cpu_suspend,
@@ -161,6 +162,8 @@ int __init davinci_pm_init(void)
suspend_set_ops(&davinci_pm_ops);
+no_sram_mem:
+ iounmap(pm_config.ddrpsc_reg_base);
no_ddrpsc_mem:
iounmap(pm_config.ddrpll_reg_base);
no_ddrpll_mem:
--
2.11.0
[toc] | [next] | [standalone]
| From | Sekhar Nori <nsekhar@ti.com> |
|---|---|
| Date | 2017-05-17 11:30 +0200 |
| Subject | Re: [PATCH 1/2] ARM: davinci: PM: Free resources in error handling path in 'davinci_pm_init' |
| Message-ID | <tI3rj-1fU-1@gated-at.bofh.it> |
| In reply to | #1640887 |
On Saturday 13 May 2017 05:10 PM, Christophe JAILLET wrote:
> If 'sram_alloc' fails, we need to free already allocated resources.
>
> Fixes: aa9aa1ec2df6 ("ARM: davinci: PM: rework init, remove platform device")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Applied to fixes for v4.12.
Thanks,
Sekhar
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web