2022-11-26 02:41:13

by Zheng Yongjun

Subject: [PATCH v2] media: aspeed: Fix return value check in aspeed_video_debugfs_create()

In case of error, the function debugfs_create_file() returns ERR_PTR()
and never returns NULL. The NULL test in the return value check
should be replaced with IS_ERR().

Fixes: 52fed10ad756 ("media: aspeed: add debugfs")
Signed-off-by: Zheng Yongjun <[email protected]>
---
v2:
- change return error code from ERR_PTR to PTR_ERR.
drivers/media/platform/aspeed/aspeed-video.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/media/platform/aspeed/aspeed-video.c b/drivers/media/platform/aspeed/aspeed-video.c
index 20f795ccc11b..0113e6bc836f 100644
--- a/drivers/media/platform/aspeed/aspeed-video.c
+++ b/drivers/media/platform/aspeed/aspeed-video.c
@@ -1780,10 +1780,12 @@ static int aspeed_video_debugfs_create(struct aspeed_video *video)
debugfs_entry = debugfs_create_file(DEVICE_NAME, 0444, NULL,
video,
&aspeed_video_debugfs_ops);
- if (!debugfs_entry)
+ if (IS_ERR(debugfs_entry)) {
aspeed_video_debugfs_remove(video);
+ return PTR_ERR(debugfs_entry);
+ }

- return !debugfs_entry ? -EIO : 0;
+ return 0;
}
#else
static void aspeed_video_debugfs_remove(struct aspeed_video *video) { }
--
2.17.1

2022-11-26 18:08:05

by Andrew Lunn

Subject: Re: [PATCH v2] media: aspeed: Fix return value check in aspeed_video_debugfs_create()

On Sat, Nov 26, 2022 at 02:28:13AM +0000, Zheng Yongjun wrote:
> In case of error, the function debugfs_create_file() returns ERR_PTR()
> and never returns NULL. The NULL test in the return value check
> should be replaced with IS_ERR().
>
> Fixes: 52fed10ad756 ("media: aspeed: add debugfs")
> Signed-off-by: Zheng Yongjun <[email protected]>

Please see:

https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/

and there are other examples. Just delete all the checks.

Andrew