[PATCH 1/2] ARM: davinci: PM: Free resources in error handling path in 'davinci_pm_init'

Path	csiph.com!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod
From	Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Newsgroups	linux.kernel
Subject	[PATCH 1/2] ARM: davinci: PM: Free resources in error handling path in 'davinci_pm_init'
Date	Sat, 13 May 2017 13:50:02 +0200
Message-ID	<tGDIC-35B-17@gated-at.bofh.it> (permalink)
X-Me-Helo	localhost.localdomain
X-Me-Auth	Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI=
X-Me-Date	Sat, 13 May 2017 13:40:14 +0200
X-Me-IP	92.140.175.66
X-Mailer	git-send-email 2.11.0
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	33
Organization	linux.* mail to news gateway
X-Original-Cc	linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET <christophe.jaillet@wanadoo.fr>
X-Original-Date	Sat, 13 May 2017 13:40:05 +0200
X-Original-Message-ID	<20170513114005.23617-1-christophe.jaillet@wanadoo.fr>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1640887

Show key headers only | View raw

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

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[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

csiph-web