From: Robert Richter <rric@kernel.org>
To: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Cc: jan.glauber@gmail.com, wsa@kernel.org, linux-i2c@vger.kernel.org,
linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: Re: [PATCH] i2c: thunderx: Fix some resource leak
Date: Mon, 18 Oct 2021 23:15:12 +0200 [thread overview]
Message-ID: <YW3j4MF/y4T6Rtzp@rric.localdomain> (raw)
In-Reply-To: <6657505309174d3ea6df14169d42b6df91298470.1634374036.git.christophe.jaillet@wanadoo.fr>
On 16.10.21 10:48:26, Christophe JAILLET wrote:
> We need to undo a 'pci_request_regions()' call in the error handling path
> of the probe function and in the remove function.
Isn't that devm and thus not needed?
>
> Fixes: 22d40209de3b ("i2c: thunderx: Add i2c driver for ThunderX SOC")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---
> drivers/i2c/busses/i2c-thunderx-pcidrv.c | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-thunderx-pcidrv.c b/drivers/i2c/busses/i2c-thunderx-pcidrv.c
> index 12c90aa0900e..2d37096a6968 100644
> --- a/drivers/i2c/busses/i2c-thunderx-pcidrv.c
> +++ b/drivers/i2c/busses/i2c-thunderx-pcidrv.c
> @@ -177,8 +177,10 @@ static int thunder_i2c_probe_pci(struct pci_dev *pdev,
> return ret;
>
There is a pcim_enable_device() call before all that, so the regions
should be removed on device release, see pcim_release().
-Robert
> i2c->twsi_base = pcim_iomap(pdev, 0, pci_resource_len(pdev, 0));
> - if (!i2c->twsi_base)
> - return -EINVAL;
> + if (!i2c->twsi_base) {
> + ret = -EINVAL;
> + goto err_release_regions;
> + }
>
> thunder_i2c_clock_enable(dev, i2c);
> ret = device_property_read_u32(dev, "clock-frequency", &i2c->twsi_freq);
> @@ -231,6 +233,8 @@ static int thunder_i2c_probe_pci(struct pci_dev *pdev,
>
> error:
> thunder_i2c_clock_disable(dev, i2c->clk);
> +err_release_regions:
> + pci_release_regions(pdev);
> return ret;
> }
>
> @@ -241,6 +245,7 @@ static void thunder_i2c_remove_pci(struct pci_dev *pdev)
> thunder_i2c_smbus_remove(i2c);
> thunder_i2c_clock_disable(&pdev->dev, i2c->clk);
> i2c_del_adapter(&i2c->adap);
> + pci_release_regions(pdev);
> }
>
> static const struct pci_device_id thunder_i2c_pci_id_table[] = {
> --
> 2.30.2
>
next prev parent reply other threads:[~2021-10-18 21:15 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-16 8:48 [PATCH] i2c: thunderx: Fix some resource leak Christophe JAILLET
2021-10-18 21:15 ` Robert Richter [this message]
2021-10-19 17:29 ` Christophe JAILLET
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=YW3j4MF/y4T6Rtzp@rric.localdomain \
--to=rric@kernel.org \
--cc=christophe.jaillet@wanadoo.fr \
--cc=jan.glauber@gmail.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=wsa@kernel.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 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).