From: Kang Chen <void0red@gmail.com>
To: jdelvare@suse.com
Cc: linux@roeck-us.net, mezin.alexander@gmail.com,
linux-hwmon@vger.kernel.org, linux-kernel@vger.kernel.org,
Kang Chen <void0red@gmail.com>
Subject: [PATCH] hwmon: add a check of devm_add_action
Date: Mon, 27 Feb 2023 10:17:20 +0800 [thread overview]
Message-ID: <20230227021720.1578781-1-void0red@gmail.com> (raw)
devm_add_action may fails, do the cleanup when if fails.
Signed-off-by: Kang Chen <void0red@gmail.com>
---
drivers/hwmon/g762.c | 6 +++++-
drivers/hwmon/nzxt-smart2.c | 4 +++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/hwmon/g762.c b/drivers/hwmon/g762.c
index 64a0599b2..d06d8bf20 100644
--- a/drivers/hwmon/g762.c
+++ b/drivers/hwmon/g762.c
@@ -620,7 +620,11 @@ static int g762_of_clock_enable(struct i2c_client *client)
data = i2c_get_clientdata(client);
data->clk = clk;
- devm_add_action(&client->dev, g762_of_clock_disable, data);
+ ret = devm_add_action(&client->dev, g762_of_clock_disable, data);
+ if (ret) {
+ dev_err(&client->dev, "failed to add disable clock action\n");
+ goto clk_unprep;
+ }
return 0;
clk_unprep:
diff --git a/drivers/hwmon/nzxt-smart2.c b/drivers/hwmon/nzxt-smart2.c
index 2b93ba896..725974cb3 100644
--- a/drivers/hwmon/nzxt-smart2.c
+++ b/drivers/hwmon/nzxt-smart2.c
@@ -737,8 +737,10 @@ static int nzxt_smart2_hid_probe(struct hid_device *hdev,
init_waitqueue_head(&drvdata->wq);
mutex_init(&drvdata->mutex);
- devm_add_action(&hdev->dev, (void (*)(void *))mutex_destroy,
+ ret = devm_add_action(&hdev->dev, (void (*)(void *))mutex_destroy,
&drvdata->mutex);
+ if (ret)
+ return ret;
ret = hid_parse(hdev);
if (ret)
--
2.34.1
next reply other threads:[~2023-02-27 2:29 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-27 2:17 Kang Chen [this message]
2023-02-27 2:36 ` [PATCH] hwmon: add a check of devm_add_action Guenter Roeck
2023-02-27 3:09 ` [PATCH v2 1/2] hwmon: g762: add a check of devm_add_action in g762_of_clock_enable void0red
2023-02-27 3:09 ` [PATCH v2 2/2] hwmon: nzxt-smart2: add a check of devm_add_action in nzxt_smart2_hid_probe void0red
2023-02-27 4:21 ` Guenter Roeck
2023-02-27 9:15 ` [PATCH v3] hwmon: nzxt-smart2: handle failure " void0red
2023-03-10 16:42 ` Guenter Roeck
2023-03-10 16:42 ` [PATCH v2 1/2] hwmon: g762: add a check of devm_add_action in g762_of_clock_enable Guenter Roeck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230227021720.1578781-1-void0red@gmail.com \
--to=void0red@gmail.com \
--cc=jdelvare@suse.com \
--cc=linux-hwmon@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=mezin.alexander@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox