From: Bjorn Andersson <bjorn.andersson@linaro.org>
To: Zhihao Cheng <chengzhihao1@huawei.com>
Cc: agross@kernel.org, wsa@kernel.org, sricharan@codeaurora.org,
linux-arm-msm@vger.kernel.org, linux-i2c@vger.kernel.org,
linux-kernel@vger.kernel.org, yi.zhang@huawei.com
Subject: Re: [PATCH] i2c: qup: Fix error return code in qup_i2c_bam_schedule_desc()
Date: Sat, 21 Nov 2020 22:08:48 -0600 [thread overview]
Message-ID: <20201122040848.GB95182@builder.lan> (raw)
In-Reply-To: <20201116141058.2365043-1-chengzhihao1@huawei.com>
On Mon 16 Nov 08:10 CST 2020, Zhihao Cheng wrote:
> Fix to return the error code from qup_i2c_change_state()
> instaed of 0 in qup_i2c_bam_schedule_desc().
>
> Fixes: fbf9921f8b35d9b2 ("i2c: qup: Fix error handling")
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: Zhihao Cheng <chengzhihao1@huawei.com>
> ---
> drivers/i2c/busses/i2c-qup.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/i2c/busses/i2c-qup.c b/drivers/i2c/busses/i2c-qup.c
> index fbc04b60cfd1..5a47915869ae 100644
> --- a/drivers/i2c/busses/i2c-qup.c
> +++ b/drivers/i2c/busses/i2c-qup.c
> @@ -801,7 +801,8 @@ static int qup_i2c_bam_schedule_desc(struct qup_i2c_dev *qup)
> if (ret || qup->bus_err || qup->qup_err) {
> reinit_completion(&qup->xfer);
>
> - if (qup_i2c_change_state(qup, QUP_RUN_STATE)) {
> + ret = qup_i2c_change_state(qup, QUP_RUN_STATE);
In the case that we entered this block because ret was -ETIMEDOUT then
this will overwrite this and the function will return -EIO.
But in the other paths out of this block ret is being overwritten
anyways, so I think it's fine.
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Regards,
Bjorn
> + if (ret) {
> dev_err(qup->dev, "change to run state timed out");
> goto desc_err;
> }
> --
> 2.25.4
>
next prev parent reply other threads:[~2020-11-22 4:09 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-16 14:10 [PATCH] i2c: qup: Fix error return code in qup_i2c_bam_schedule_desc() Zhihao Cheng
2020-11-22 4:08 ` Bjorn Andersson [this message]
2020-12-02 15:42 ` 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=20201122040848.GB95182@builder.lan \
--to=bjorn.andersson@linaro.org \
--cc=agross@kernel.org \
--cc=chengzhihao1@huawei.com \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sricharan@codeaurora.org \
--cc=wsa@kernel.org \
--cc=yi.zhang@huawei.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).