From: YueHaibing <yuehaibing@huawei.com>
To: Boris Brezillon <bbrezillon@kernel.org>
Cc: robert.jarzmik@free.fr, linux-kernel@vger.kernel.org,
marek.vasut@gmail.com, linux-mtd@lists.infradead.org,
richard@nod.at, computersforpeace@gmail.com, dwmw2@infradead.org
Subject: Re: [PATCH -next] mtd: docg3: Fix passing zero to 'PTR_ERR' warning in doc_probe_device
Date: Wed, 23 Jan 2019 17:43:58 +0800 [thread overview]
Message-ID: <86533285-e800-5cc0-f495-88fff8326b5a@huawei.com> (raw)
In-Reply-To: <20190123101253.243add9d@bbrezillon>
On 2019/1/23 17:12, Boris Brezillon wrote:
> On Wed, 23 Jan 2019 14:58:27 +0800
> YueHaibing <yuehaibing@huawei.com> wrote:
>
>> Fix a static code checker warning:
>> drivers/mtd/devices/docg3.c:1875
>> doc_probe_device() warn: passing zero to 'ERR_PTR'
>>
>> Fixes: ae9d4934b2d7 ("mtd: docg3: add multiple floor support")
>> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
>> ---
>> drivers/mtd/devices/docg3.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/mtd/devices/docg3.c b/drivers/mtd/devices/docg3.c
>> index 4c94fc0..60ddc38 100644
>> --- a/drivers/mtd/devices/docg3.c
>> +++ b/drivers/mtd/devices/docg3.c
>> @@ -1872,7 +1872,7 @@ doc_probe_device(struct docg3_cascade *cascade, int floor, struct device *dev)
>> nomem2:
>> kfree(docg3);
>> nomem1:
>> - return ERR_PTR(ret);
>> + return ret ? ERR_PTR(ret) : NULL;
>> }
>>
>
> This is not the right fix, you should instead set ret to -EINVAL:
Thanks , will fix it in v2.
And seems doc_probe_device cannot return NULL. The NULL check of doc_probe_device
in docg3_probe also can been removed, right?
>
> --->8---
> diff --git a/drivers/mtd/devices/docg3.c b/drivers/mtd/devices/docg3.c
> index 4c94fc096696..6b84db411232 100644
> --- a/drivers/mtd/devices/docg3.c
> +++ b/drivers/mtd/devices/docg3.c
> @@ -1842,7 +1842,7 @@ doc_probe_device(struct docg3_cascade *cascade, int floor, struct device *dev)
> chip_id = doc_register_readw(docg3, DOC_CHIPID);
> chip_id_inv = doc_register_readw(docg3, DOC_CHIPID_INV);
>
> - ret = 0;
> + ret = -ENOMEM;
> if (chip_id != (u16)(~chip_id_inv)) {
> goto nomem4;
> }
>
> .
>
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
next prev parent reply other threads:[~2019-01-23 9:44 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-23 6:58 [PATCH -next] mtd: docg3: Fix passing zero to 'PTR_ERR' warning in doc_probe_device YueHaibing
2019-01-23 9:12 ` Boris Brezillon
2019-01-23 9:43 ` YueHaibing [this message]
2019-01-23 9:52 ` Boris Brezillon
2019-01-23 20:49 ` Robert Jarzmik
2019-01-28 9:36 ` [-next] " Boris Brezillon
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=86533285-e800-5cc0-f495-88fff8326b5a@huawei.com \
--to=yuehaibing@huawei.com \
--cc=bbrezillon@kernel.org \
--cc=computersforpeace@gmail.com \
--cc=dwmw2@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=marek.vasut@gmail.com \
--cc=richard@nod.at \
--cc=robert.jarzmik@free.fr \
/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