From: Jisheng Zhang <jszhang@marvell.com>
To: <jszhang@marvell.com>, <jason@lakedaemon.net>, <andrew@lunn.ch>,
<gregory.clement@free-electrons.com>,
<thomas.petazzoni@free-electrons.com>,
<ezequiel.garcia@free-electrons.com>, <mturquette@linaro.org>,
<sebastian.hesselbarth@gmail.com>, <linus.walleij@linaro.org>
Cc: <linux@arm.linux.org.uk>, <linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>
Subject: [PATCH v5 3/3] pinctrl: mvebu: Convert to use devm_ioremap_resource
Date: Tue, 27 Aug 2013 12:41:16 +0800 [thread overview]
Message-ID: <1377578476-3268-4-git-send-email-jszhang@marvell.com> (raw)
In-Reply-To: <1377578476-3268-1-git-send-email-jszhang@marvell.com>
The resource mapped by of_iomap() isn't unmapped in error path. This
patch fix the resource leakage by using devm_ioremap_resource() instead
of of_iomap().
Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
Reviewed-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Acked-by: Jason Cooper <jason@lakedaemon.net>
---
drivers/pinctrl/mvebu/pinctrl-mvebu.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/drivers/pinctrl/mvebu/pinctrl-mvebu.c b/drivers/pinctrl/mvebu/pinctrl-mvebu.c
index bb7ddb1..1caa45f 100644
--- a/drivers/pinctrl/mvebu/pinctrl-mvebu.c
+++ b/drivers/pinctrl/mvebu/pinctrl-mvebu.c
@@ -579,7 +579,7 @@ static int mvebu_pinctrl_build_functions(struct platform_device *pdev,
int mvebu_pinctrl_probe(struct platform_device *pdev)
{
struct mvebu_pinctrl_soc_info *soc = dev_get_platdata(&pdev->dev);
- struct device_node *np = pdev->dev.of_node;
+ struct resource *res;
struct mvebu_pinctrl *pctl;
void __iomem *base;
struct pinctrl_pin_desc *pdesc;
@@ -591,11 +591,10 @@ int mvebu_pinctrl_probe(struct platform_device *pdev)
return -EINVAL;
}
- base = of_iomap(np, 0);
- if (!base) {
- dev_err(&pdev->dev, "unable to get base address\n");
- return -ENODEV;
- }
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ base = devm_ioremap_resource(&pdev->dev, res);
+ if (IS_ERR(base))
+ return PTR_ERR(base);
pctl = devm_kzalloc(&pdev->dev, sizeof(struct mvebu_pinctrl),
GFP_KERNEL);
--
1.8.4.rc3
next prev parent reply other threads:[~2013-08-27 4:45 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-27 4:41 [PATCH v5 0/3] arm: mvebu: fix resource leak Jisheng Zhang
2013-08-27 4:41 ` [PATCH v5 1/3] arm: mvebu: add missing of_node_put() to fix reference leak Jisheng Zhang
2013-08-27 4:41 ` [PATCH v5 2/3] bus: " Jisheng Zhang
2013-08-27 4:41 ` Jisheng Zhang [this message]
2013-08-28 12:18 ` [PATCH v5 3/3] pinctrl: mvebu: Convert to use devm_ioremap_resource Linus Walleij
2013-08-27 14:42 ` [PATCH v5 0/3] arm: mvebu: fix resource leak Jason Cooper
2013-08-28 12:19 ` Linus Walleij
2013-11-07 3:08 [PATCH 0/4] arm: make use of common scu_a9_get_base() interface Jisheng Zhang
2013-11-07 3:08 ` [PATCH v5 3/3] pinctrl: mvebu: Convert to use devm_ioremap_resource Jisheng Zhang
2013-11-07 17:57 ` Gregory CLEMENT
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=1377578476-3268-4-git-send-email-jszhang@marvell.com \
--to=jszhang@marvell.com \
--cc=andrew@lunn.ch \
--cc=ezequiel.garcia@free-electrons.com \
--cc=gregory.clement@free-electrons.com \
--cc=jason@lakedaemon.net \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=mturquette@linaro.org \
--cc=sebastian.hesselbarth@gmail.com \
--cc=thomas.petazzoni@free-electrons.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).