From: Michal Simek <michal.simek@amd.com>
To: Lars-Peter Clausen <lars@metafoo.de>, Wolfram Sang <wsa@kernel.org>
Cc: Shubhrajyoti Datta <Shubhrajyoti.datta@amd.com>,
linux-i2c@vger.kernel.org
Subject: Re: [PATCH 2/2] i2c: xiic: xiic_xfer(): Fix runtime PM leak on error path
Date: Fri, 14 Apr 2023 14:57:32 +0200 [thread overview]
Message-ID: <3d651214-bc23-ae31-0e0c-a8abdc518c35@amd.com> (raw)
In-Reply-To: <20230414021022.505291-2-lars@metafoo.de>
On 4/14/23 04:10, Lars-Peter Clausen wrote:
> The xiic_xfer() function gets a runtime PM reference when the function is
> entered. This reference is released when the function is exited. There is
> currently one error path where the function exits directly, which leads to
> a leak of the runtime PM reference.
>
> Make sure that this error path also releases the runtime PM reference.
>
> Fixes: fdacc3c7405d ("i2c: xiic: Switch from waitqueue to completion")
> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
> ---
> drivers/i2c/busses/i2c-xiic.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/i2c/busses/i2c-xiic.c b/drivers/i2c/busses/i2c-xiic.c
> index e7d37eb20f2b..8a3d9817cb41 100644
> --- a/drivers/i2c/busses/i2c-xiic.c
> +++ b/drivers/i2c/busses/i2c-xiic.c
> @@ -1164,7 +1164,7 @@ static int xiic_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
> err = xiic_start_xfer(i2c, msgs, num);
> if (err < 0) {
> dev_err(adap->dev.parent, "Error xiic_start_xfer\n");
> - return err;
> + goto out;
> }
>
> err = wait_for_completion_timeout(&i2c->completion, XIIC_XFER_TIMEOUT);
> @@ -1178,6 +1178,8 @@ static int xiic_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
> err = (i2c->state == STATE_DONE) ? num : -EIO;
> }
> mutex_unlock(&i2c->lock);
> +
> +out:
> pm_runtime_mark_last_busy(i2c->dev);
> pm_runtime_put_autosuspend(i2c->dev);
> return err;
Reviewed-by: Michal Simek <michal.simek@amd.com>
Thanks,
Michal
next prev parent reply other threads:[~2023-04-14 12:59 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-14 2:10 [PATCH 1/2] i2c: cadence: cdns_i2c_master_xfer(): Fix runtime PM leak on error path Lars-Peter Clausen
2023-04-14 2:10 ` [PATCH 2/2] i2c: xiic: xiic_xfer(): " Lars-Peter Clausen
2023-04-14 12:57 ` Michal Simek [this message]
2023-04-18 16:44 ` Wolfram Sang
2023-04-14 12:57 ` [PATCH 1/2] i2c: cadence: cdns_i2c_master_xfer(): " Michal Simek
2023-04-18 16:44 ` Wolfram Sang
2023-04-24 9:28 ` Wolfram Sang
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=3d651214-bc23-ae31-0e0c-a8abdc518c35@amd.com \
--to=michal.simek@amd.com \
--cc=Shubhrajyoti.datta@amd.com \
--cc=lars@metafoo.de \
--cc=linux-i2c@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