2022-07-29 02:50:44

by Yang Yingliang

[permalink] [raw]
Subject: [PATCH -next] video: fbdev: imxfb: fix return value check in imxfb_probe()

If devm_ioremap_resource() fails, it never return NULL, replace
NULL test with IS_ERR().

Fixes: b083c22d5114 ("video: fbdev: imxfb: Convert request_mem_region + ioremap to devm_ioremap_resource")
Signed-off-by: Yang Yingliang <[email protected]>
---
drivers/video/fbdev/imxfb.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/video/fbdev/imxfb.c b/drivers/video/fbdev/imxfb.c
index c48477893dd0..d97d7456d15a 100644
--- a/drivers/video/fbdev/imxfb.c
+++ b/drivers/video/fbdev/imxfb.c
@@ -971,9 +971,9 @@ static int imxfb_probe(struct platform_device *pdev)
}

fbi->regs = devm_ioremap_resource(&pdev->dev, res);
- if (fbi->regs == NULL) {
+ if (IS_ERR(fbi->regs)) {
dev_err(&pdev->dev, "Cannot map frame buffer registers\n");
- ret = -ENOMEM;
+ ret = PTR_ERR(fbi->regs);
goto failed_ioremap;
}

--
2.25.1


2022-07-29 21:35:07

by Helge Deller

[permalink] [raw]
Subject: Re: [PATCH -next] video: fbdev: imxfb: fix return value check in imxfb_probe()

On 7/29/22 04:41, Yang Yingliang wrote:
> If devm_ioremap_resource() fails, it never return NULL, replace
> NULL test with IS_ERR().
>
> Fixes: b083c22d5114 ("video: fbdev: imxfb: Convert request_mem_region + ioremap to devm_ioremap_resource")
> Signed-off-by: Yang Yingliang <[email protected]>

applied to fbdev git tree.

Thanks!
Helge

> ---
> drivers/video/fbdev/imxfb.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/video/fbdev/imxfb.c b/drivers/video/fbdev/imxfb.c
> index c48477893dd0..d97d7456d15a 100644
> --- a/drivers/video/fbdev/imxfb.c
> +++ b/drivers/video/fbdev/imxfb.c
> @@ -971,9 +971,9 @@ static int imxfb_probe(struct platform_device *pdev)
> }
>
> fbi->regs = devm_ioremap_resource(&pdev->dev, res);
> - if (fbi->regs == NULL) {
> + if (IS_ERR(fbi->regs)) {
> dev_err(&pdev->dev, "Cannot map frame buffer registers\n");
> - ret = -ENOMEM;
> + ret = PTR_ERR(fbi->regs);
> goto failed_ioremap;
> }
>

2022-07-31 00:06:00

by Uwe Kleine-König

[permalink] [raw]
Subject: Re: [PATCH -next] video: fbdev: imxfb: fix return value check in imxfb_probe()

Hello,

On Fri, Jul 29, 2022 at 10:41:34AM +0800, Yang Yingliang wrote:
> If devm_ioremap_resource() fails, it never return NULL, replace
> NULL test with IS_ERR().

Oh, thanks for cleanup up behind me. Did you find this using some static
analysis tool? I would consider it interesting and fair to mention this
in the commit log.

Best regards
Uwe


--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | https://www.pengutronix.de/ |

Attachments:
(No filename) (521.00 B)
 signature.asc (499.00 B)
 Download all attachments

2022-08-01 03:06:16

by Yang Yingliang

[permalink] [raw]
Subject: Re: [PATCH -next] video: fbdev: imxfb: fix return value check in imxfb_probe()

Hi,

On 2022/7/31 7:18, Uwe Kleine-K?nig wrote:
> Hello,
>
> On Fri, Jul 29, 2022 at 10:41:34AM +0800, Yang Yingliang wrote:
>> If devm_ioremap_resource() fails, it never return NULL, replace
>> NULL test with IS_ERR().
> Oh, thanks for cleanup up behind me. Did you find this using some static
> analysis tool? I would consider it interesting and fair to mention this
> in the commit log.
I found it by coccicheck like this:

@@
expression ret, E;
@@
ret = \(devm_ioremap_resource\)(...);
... when != ret = E
??? when != IS_ERR(ret)
(
?ret == NULL || IS_ERR(ret)
|
?IS_ERR(ret) || ret == NULL
|
?ret != NULL && !IS_ERR(ret)
|
?!IS_ERR(ret) && ret != NULL
|
- ret == NULL
+ IS_ERR(ret)
|
- ret != NULL
+ !IS_ERR(ret)
)

Thanks,
Yang
>
> Best regards
> Uwe
>
>