2023-02-08 04:01:17

by Qi Zheng

Subject: [PATCH RESEND] PM/OPP: fix error checking in opp_migrate_dentry()

Since commit ff9fb72bc077 ("debugfs: return error values,
not NULL") changed return value of debugfs_rename() in
error cases from %NULL to %ERR_PTR(-ERROR), we should
also check error values instead of NULL.

Fixes: ff9fb72bc077 ("debugfs: return error values, not NULL")
Signed-off-by: Qi Zheng <[email protected]>
---
Resend as a separate patch.

drivers/opp/debugfs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/opp/debugfs.c b/drivers/opp/debugfs.c
index 96a30a032c5f..2c7fb683441e 100644
--- a/drivers/opp/debugfs.c
+++ b/drivers/opp/debugfs.c
@@ -235,7 +235,7 @@ static void opp_migrate_dentry(struct opp_device *opp_dev,

dentry = debugfs_rename(rootdir, opp_dev->dentry, rootdir,
opp_table->dentry_name);
- if (!dentry) {
+ if (IS_ERR(dentry)) {
dev_err(dev, "%s: Failed to rename link from: %s to %s\n",
__func__, dev_name(opp_dev->dev), dev_name(dev));
return;
--
2.20.1

2023-02-08 05:12:35

by Viresh Kumar

Subject: Re: [PATCH RESEND] PM/OPP: fix error checking in opp_migrate_dentry()

On 08-02-23, 12:00, Qi Zheng wrote:
> Since commit ff9fb72bc077 ("debugfs: return error values,
> not NULL") changed return value of debugfs_rename() in
> error cases from %NULL to %ERR_PTR(-ERROR), we should
> also check error values instead of NULL.
>
> Fixes: ff9fb72bc077 ("debugfs: return error values, not NULL")
> Signed-off-by: Qi Zheng <[email protected]>
> ---
> Resend as a separate patch.
>
> drivers/opp/debugfs.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/opp/debugfs.c b/drivers/opp/debugfs.c
> index 96a30a032c5f..2c7fb683441e 100644
> --- a/drivers/opp/debugfs.c
> +++ b/drivers/opp/debugfs.c
> @@ -235,7 +235,7 @@ static void opp_migrate_dentry(struct opp_device *opp_dev,
>
> dentry = debugfs_rename(rootdir, opp_dev->dentry, rootdir,
> opp_table->dentry_name);
> - if (!dentry) {
> + if (IS_ERR(dentry)) {
> dev_err(dev, "%s: Failed to rename link from: %s to %s\n",
> __func__, dev_name(opp_dev->dev), dev_name(dev));
> return;

Applied. Thanks.

--
viresh