From: heiko@sntech.de (Heiko Stübner)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v4 1/6] misc: sram: fix error path in sram_probe
Date: Mon, 29 Jul 2013 15:11:20 +0200 [thread overview]
Message-ID: <201307291511.21067.heiko@sntech.de> (raw)
In-Reply-To: <201307291510.31679.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>
Acked-by: Philipp Zabel <p.zabel@pengutronix.de>
---
Only included for reference and completeness, as it is already
added to the char-misc git tree.
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
WARNING: multiple messages have this Message-ID (diff)
From: "Heiko Stübner" <heiko@sntech.de>
To: Arnd Bergmann <arnd@arndb.de>
Cc: Russell King <linux@arm.linux.org.uk>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
devicetree-discuss@lists.ozlabs.org,
linux-kernel@vger.kernel.org,
Grant Likely <grant.likely@linaro.org>,
Ulrich Prinz <ulrich.prinz@googlemail.com>,
Philipp Zabel <p.zabel@pengutronix.de>,
Olof Johansson <olof@lixom.net>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>
Subject: [PATCH v4 1/6] misc: sram: fix error path in sram_probe
Date: Mon, 29 Jul 2013 15:11:20 +0200 [thread overview]
Message-ID: <201307291511.21067.heiko@sntech.de> (raw)
In-Reply-To: <201307291510.31679.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>
Acked-by: Philipp Zabel <p.zabel@pengutronix.de>
---
Only included for reference and completeness, as it is already
added to the char-misc git tree.
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
WARNING: multiple messages have this Message-ID (diff)
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 v4 1/6] misc: sram: fix error path in sram_probe
Date: Mon, 29 Jul 2013 15:11:20 +0200 [thread overview]
Message-ID: <201307291511.21067.heiko@sntech.de> (raw)
In-Reply-To: <201307291510.31679.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>
Acked-by: Philipp Zabel <p.zabel@pengutronix.de>
---
Only included for reference and completeness, as it is already
added to the char-misc git tree.
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-29 13:11 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-29 13:10 [PATCH v4 0/6] ARM: rockchip: add smp functionality Heiko Stübner
2013-07-29 13:10 ` Heiko Stübner
2013-07-29 13:10 ` Heiko Stübner
2013-07-29 13:11 ` Heiko Stübner [this message]
2013-07-29 13:11 ` [PATCH v4 1/6] misc: sram: fix error path in sram_probe Heiko Stübner
2013-07-29 13:11 ` Heiko Stübner
2013-07-29 13:12 ` [PATCH v4 2/6] misc: sram: add ability to mark sram sections as reserved Heiko Stübner
2013-07-29 13:12 ` Heiko Stübner
2013-07-29 14:02 ` Philipp Zabel
2013-07-29 14:02 ` Philipp Zabel
2013-07-29 14:02 ` Philipp Zabel
2013-07-29 21:39 ` Matt Sealey
2013-07-29 21:39 ` Matt Sealey
2013-08-01 16:35 ` Heiko Stübner
2013-08-01 16:35 ` Heiko Stübner
2013-08-01 16:35 ` Heiko Stübner
2013-08-01 17:07 ` Matt Sealey
2013-08-01 17:07 ` Matt Sealey
2013-07-29 13:13 ` [PATCH v4 3/6] ARM: rockchip: add snoop-control-unit Heiko Stübner
2013-07-29 13:13 ` Heiko Stübner
2013-07-29 13:13 ` [PATCH v4 4/6] ARM: rockchip: add sram dt nodes and documentation Heiko Stübner
2013-07-29 13:13 ` Heiko Stübner
2013-07-29 13:14 ` [PATCH v4 5/6] ARM: rockchip: add power-management-unit dt node Heiko Stübner
2013-07-29 13:14 ` Heiko Stübner
2013-07-29 13:15 ` [PATCH v4 6/6] ARM: rockchip: add smp bringup code Heiko Stübner
2013-07-29 13:15 ` Heiko Stübner
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=201307291511.21067.heiko@sntech.de \
--to=heiko@sntech.de \
--cc=linux-arm-kernel@lists.infradead.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.