2022-04-19 09:36:37

by CGEL

Subject: [PATCH] media: amphion: fix error check return value of debugfs_create_file()

From: Lv Ruyi <[email protected]>

If an error occurs, debugfs_create_file() will return ERR_PTR(-ERROR),
so use IS_ERR() to check it.

Fixes: 9f599f351e86 ("media: amphion: add vpu core driver")
Reported-by: Zeal Robot <[email protected]>
Signed-off-by: Lv Ruyi <[email protected]>
---
drivers/media/platform/amphion/vpu_dbg.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/media/platform/amphion/vpu_dbg.c b/drivers/media/platform/amphion/vpu_dbg.c
index 376196bea178..5cef1fd41a74 100644
--- a/drivers/media/platform/amphion/vpu_dbg.c
+++ b/drivers/media/platform/amphion/vpu_dbg.c
@@ -413,7 +413,7 @@ int vpu_inst_create_dbgfs_file(struct vpu_inst *inst)
vpu->debugfs,
inst,
&vpu_dbg_inst_fops);
- if (!inst->debugfs) {
+ if (IS_ERR(inst->debugfs)) {
dev_err(inst->dev, "vpu create debugfs %s fail\n", name);
return -EINVAL;
}
@@ -451,7 +451,7 @@ int vpu_core_create_dbgfs_file(struct vpu_core *core)
vpu->debugfs,
core,
&vpu_dbg_core_fops);
- if (!core->debugfs) {
+ if (IS_ERR(core->debugfs)) {
dev_err(core->dev, "vpu create debugfs %s fail\n", name);
return -EINVAL;
}
@@ -463,7 +463,7 @@ int vpu_core_create_dbgfs_file(struct vpu_core *core)
vpu->debugfs,
core,
&vpu_dbg_fwlog_fops);
- if (!core->debugfs_fwlog) {
+ if (IS_ERR(core->debugfs_fwlog)) {
dev_err(core->dev, "vpu create debugfs %s fail\n", name);
return -EINVAL;
}
--
2.25.1

2022-04-22 17:26:15

by Hans Verkuil

Subject: Re: [PATCH] media: amphion: fix error check return value of debugfs_create_file()

On 19/04/2022 03:38, [email protected] wrote:
> From: Lv Ruyi <[email protected]>
>
> If an error occurs, debugfs_create_file() will return ERR_PTR(-ERROR),
> so use IS_ERR() to check it.

Actually, errors should never be checked for debugfs. See e.g. commit
1d8f95c497053839be326bd97eb3128e3b3312cb which removed unnecessary checks
in drivers/media/radio/radio-si476x.c.

Can you make a v2 that removes all the debugfs checks from this driver?

Regards,

Hans

>
> Fixes: 9f599f351e86 ("media: amphion: add vpu core driver")
> Reported-by: Zeal Robot <[email protected]>
> Signed-off-by: Lv Ruyi <[email protected]>
> ---
> drivers/media/platform/amphion/vpu_dbg.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/media/platform/amphion/vpu_dbg.c b/drivers/media/platform/amphion/vpu_dbg.c
> index 376196bea178..5cef1fd41a74 100644
> --- a/drivers/media/platform/amphion/vpu_dbg.c
> +++ b/drivers/media/platform/amphion/vpu_dbg.c
> @@ -413,7 +413,7 @@ int vpu_inst_create_dbgfs_file(struct vpu_inst *inst)
> vpu->debugfs,
> inst,
> &vpu_dbg_inst_fops);
> - if (!inst->debugfs) {
> + if (IS_ERR(inst->debugfs)) {
> dev_err(inst->dev, "vpu create debugfs %s fail\n", name);
> return -EINVAL;
> }
> @@ -451,7 +451,7 @@ int vpu_core_create_dbgfs_file(struct vpu_core *core)
> vpu->debugfs,
> core,
> &vpu_dbg_core_fops);
> - if (!core->debugfs) {
> + if (IS_ERR(core->debugfs)) {
> dev_err(core->dev, "vpu create debugfs %s fail\n", name);
> return -EINVAL;
> }
> @@ -463,7 +463,7 @@ int vpu_core_create_dbgfs_file(struct vpu_core *core)
> vpu->debugfs,
> core,
> &vpu_dbg_fwlog_fops);
> - if (!core->debugfs_fwlog) {
> + if (IS_ERR(core->debugfs_fwlog)) {
> dev_err(core->dev, "vpu create debugfs %s fail\n", name);
> return -EINVAL;
> }

2022-04-22 22:35:15

by CGEL

Subject: Re: [PATCH] media: amphion: fix error check return value of debugfs_create_file()

Thanks for your advice, I will send v2 ASAP.

Thanks
Lv Ruyi