* [PATCH] i2c: mlxbf: Fix an error pointer vs NULL check
@ 2020-12-04 7:41 Xu Wang
2020-12-05 1:39 ` Khalil Blaiech
0 siblings, 1 reply; 2+ messages in thread
From: Xu Wang @ 2020-12-04 7:41 UTC (permalink / raw)
To: kblaiech; +Cc: linux-i2c, linux-kernel
In case of error, the function devm_ioremap() returns NULL pointer not
ERR_PTR(). The IS_ERR() test in the return value check should be
replaced with NULL test.
Signed-off-by: Xu Wang <vulab@iscas.ac.cn>
---
drivers/i2c/busses/i2c-mlxbf.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/i2c/busses/i2c-mlxbf.c b/drivers/i2c/busses/i2c-mlxbf.c
index 33574d40ea9c..73a58beb7b82 100644
--- a/drivers/i2c/busses/i2c-mlxbf.c
+++ b/drivers/i2c/busses/i2c-mlxbf.c
@@ -1258,9 +1258,9 @@ static int mlxbf_i2c_get_gpio(struct platform_device *pdev,
return -EFAULT;
gpio_res->io = devm_ioremap(dev, params->start, size);
- if (IS_ERR(gpio_res->io)) {
+ if (!gpio_res->io) {
devm_release_mem_region(dev, params->start, size);
- return PTR_ERR(gpio_res->io);
+ return -ENOMEM;
}
return 0;
@@ -1323,9 +1323,9 @@ static int mlxbf_i2c_get_corepll(struct platform_device *pdev,
return -EFAULT;
corepll_res->io = devm_ioremap(dev, params->start, size);
- if (IS_ERR(corepll_res->io)) {
+ if (!corepll_res->io) {
devm_release_mem_region(dev, params->start, size);
- return PTR_ERR(corepll_res->io);
+ return -ENOMEM;
}
return 0;
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* RE: [PATCH] i2c: mlxbf: Fix an error pointer vs NULL check
2020-12-04 7:41 [PATCH] i2c: mlxbf: Fix an error pointer vs NULL check Xu Wang
@ 2020-12-05 1:39 ` Khalil Blaiech
0 siblings, 0 replies; 2+ messages in thread
From: Khalil Blaiech @ 2020-12-05 1:39 UTC (permalink / raw)
To: Xu Wang; +Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org
> In case of error, the function devm_ioremap() returns NULL pointer not
> ERR_PTR(). The IS_ERR() test in the return value check should be
> replaced with NULL test.
>
> Signed-off-by: Xu Wang <vulab@iscas.ac.cn>
Thank you very much for your patch. Please note that previous patch
has been posted to address this issue.
> ---
> drivers/i2c/busses/i2c-mlxbf.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-mlxbf.c b/drivers/i2c/busses/i2c-mlxbf.c
> index 33574d40ea9c..73a58beb7b82 100644
> --- a/drivers/i2c/busses/i2c-mlxbf.c
> +++ b/drivers/i2c/busses/i2c-mlxbf.c
> @@ -1258,9 +1258,9 @@ static int mlxbf_i2c_get_gpio(struct
> platform_device *pdev,
> return -EFAULT;
>
> gpio_res->io = devm_ioremap(dev, params->start, size);
> - if (IS_ERR(gpio_res->io)) {
> + if (!gpio_res->io) {
> devm_release_mem_region(dev, params->start, size);
> - return PTR_ERR(gpio_res->io);
> + return -ENOMEM;
> }
>
> return 0;
> @@ -1323,9 +1323,9 @@ static int mlxbf_i2c_get_corepll(struct
> platform_device *pdev,
> return -EFAULT;
>
> corepll_res->io = devm_ioremap(dev, params->start, size);
> - if (IS_ERR(corepll_res->io)) {
> + if (!corepll_res->io) {
> devm_release_mem_region(dev, params->start, size);
> - return PTR_ERR(corepll_res->io);
> + return -ENOMEM;
> }
>
> return 0;
> --
> 2.17.1
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-12-05 1:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-04 7:41 [PATCH] i2c: mlxbf: Fix an error pointer vs NULL check Xu Wang
2020-12-05 1:39 ` Khalil Blaiech
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox