From: "Heiko Stübner" <heiko@sntech.de>
To: Arnd Bergmann <arnd@arndb.de>
Cc: Olof Johansson <olof@lixom.net>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>,
Grant Likely <grant.likely@linaro.org>,
Rob Herring <robherring2@gmail.com>,
devicetree-discuss@lists.ozlabs.org,
Russell King <linux@arm.linux.org.uk>,
Philipp Zabel <p.zabel@pengutronix.de>,
linux-kernel@vger.kernel.org,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
Ulrich Prinz <ulrich.prinz@googlemail.com>
Subject: [PATCH v3 1/6] misc: sram: fix error path in sram_probe
Date: Fri, 5 Jul 2013 14:40:53 +0200 [thread overview]
Message-ID: <201307051440.53993.heiko@sntech.de> (raw)
In-Reply-To: <201307051440.19428.heiko@sntech.de>
The pool is created thru devm_gen_pool_create, so the call to
gen_pool_destroy is not necessary.
Instead the sram-clock must be turned off again if it exists.
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Tested-by: Ulrich Prinz <ulrich.prinz@googlemail.com>
---
drivers/misc/sram.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/misc/sram.c b/drivers/misc/sram.c
index d87cc91..afe66571 100644
--- a/drivers/misc/sram.c
+++ b/drivers/misc/sram.c
@@ -68,7 +68,8 @@ static int sram_probe(struct platform_device *pdev)
ret = gen_pool_add_virt(sram->pool, (unsigned long)virt_base,
res->start, size, -1);
if (ret < 0) {
- gen_pool_destroy(sram->pool);
+ if (sram->clk)
+ clk_disable_unprepare(sram->clk);
return ret;
}
--
1.7.10.4
next prev parent reply other threads:[~2013-07-05 12:41 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-05 12:40 [PATCH v3 0/6] ARM: rockchip: add smp functionality Heiko Stübner
2013-07-05 12:40 ` Heiko Stübner [this message]
2013-07-05 14:23 ` [PATCH v3 1/6] misc: sram: fix error path in sram_probe Philipp Zabel
2013-07-05 12:41 ` [PATCH v3 2/6] misc: sram: add ability to mark sram sections as reserved Heiko Stübner
2013-07-05 12:55 ` Fabio Estevam
2013-07-05 14:23 ` Heiko Stübner
2013-07-05 14:24 ` Philipp Zabel
2013-07-07 19:46 ` Rob Herring
2013-07-05 12:41 ` [PATCH v3 3/6] ARM: rockchip: add snoop-control-unit Heiko Stübner
2013-07-05 12:42 ` [PATCH v3 4/6] ARM: rockchip: add sram dt nodes and documentation Heiko Stübner
2013-07-05 12:42 ` [PATCH v3 5/6] ARM: rockchip: add power-management-unit dt node Heiko Stübner
2013-07-05 12:43 ` [PATCH v3 6/6] ARM: rockchip: add smp bringup code Heiko Stübner
2013-07-05 14:55 ` Fabio Estevam
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201307051440.53993.heiko@sntech.de \
--to=heiko@sntech.de \
--cc=arnd@arndb.de \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=grant.likely@linaro.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=olof@lixom.net \
--cc=p.zabel@pengutronix.de \
--cc=robherring2@gmail.com \
--cc=ulrich.prinz@googlemail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).