From: Grzegorz Jaszczyk <grzegorz.jaszczyk@linaro.org>
To: Wei Yongjun <weiyongjun1@huawei.com>
Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org,
Hulk Robot <hulkci@huawei.com>,
Santosh Shilimkar <ssantosh@kernel.org>,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH -next] soc: ti: pruss: Fix return value check
Date: Thu, 17 Sep 2020 18:17:27 +0000 [thread overview]
Message-ID: <CAMxfBF5n-eCyMR2=yz8P=J=f3smDpw_3N3yZLqH9uQmZCXQy8g@mail.gmail.com> (raw)
In-Reply-To: <20200915075732.100804-1-weiyongjun1@huawei.com>
Hi
On Tue, 15 Sep 2020 at 09:58, Wei Yongjun <weiyongjun1@huawei.com> wrote:
>
> In case of error, the function of_device_get_match_data() returns NULL
> pointer not ERR_PTR(). The IS_ERR() test in the return value check
> should be replaced with NULL test.
>
> Fixes: ba59c9b43c86 ("soc: ti: pruss: support CORECLK_MUX and IEPCLK_MUX")
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
> ---
> drivers/soc/ti/pruss.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/soc/ti/pruss.c b/drivers/soc/ti/pruss.c
> index cc0b4ad7a3d3..582f48051c30 100644
> --- a/drivers/soc/ti/pruss.c
> +++ b/drivers/soc/ti/pruss.c
> @@ -126,7 +126,7 @@ static int pruss_clk_init(struct pruss *pruss, struct device_node *cfg_node)
> int ret = 0;
>
> data = of_device_get_match_data(dev);
> - if (IS_ERR(data))
> + if (!data)
> return -ENODEV;
>
> clks_np = of_get_child_by_name(cfg_node, "clocks");
> @@ -175,7 +175,7 @@ static int pruss_probe(struct platform_device *pdev)
> const char *mem_names[PRUSS_MEM_MAX] = { "dram0", "dram1", "shrdram2" };
>
> data = of_device_get_match_data(&pdev->dev);
> - if (IS_ERR(data)) {
> + if (!data) {
> dev_err(dev, "missing private data\n");
> return -ENODEV;
> }
First of all thank you for reporting this issue. Indeed the IS_ERR is
wrongly used and is leftover from a bit different former internal
implementation. Nevertheless with your fix the driver will not be
functional anymore for all devices without match data (e.g.
"ti,am3356-pruss") which is not what we want.
The proper fix would be removing the mentioned error checks, since the
"data" in both cases is checked later, before usage:
if (data && data->...).
Please let me know if you want to improve this patch by yourself or
want me to push a proper fix with your e.g. "Reported-by:" tag. For me
both solutions are ok.
Thank you,
Grzegorz
prev parent reply other threads:[~2020-09-17 18:17 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-15 7:57 [PATCH -next] soc: ti: pruss: Fix return value check Wei Yongjun
2020-09-17 18:17 ` Grzegorz Jaszczyk [this message]
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='CAMxfBF5n-eCyMR2=yz8P=J=f3smDpw_3N3yZLqH9uQmZCXQy8g@mail.gmail.com' \
--to=grzegorz.jaszczyk@linaro.org \
--cc=hulkci@huawei.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ssantosh@kernel.org \
--cc=weiyongjun1@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).