From: Wang Yufen <wangyufen@huawei.com>
To: <linux-leds@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Cc: <pavel@ucw.cz>, Wang Yufen <wangyufen@huawei.com>,
Dan Murphy <dmurphy@ti.com>
Subject: [PATCH 07/13] leds: lp8860: Fix devm vs. non-devm ordering
Date: Wed, 9 Nov 2022 16:48:08 +0800 [thread overview]
Message-ID: <1667983694-15040-8-git-send-email-wangyufen@huawei.com> (raw)
In-Reply-To: <1667983694-15040-1-git-send-email-wangyufen@huawei.com>
When non-devm resources are allocated they mustn't be followed by devm
allocations, otherwise it will break the tear down ordering and might
lead to crashes or other bugs during ->remove() stage. Fix this by
wrapping mutex_destroy() call with devm_add_action_or_reset().
Fixes: a2169c9b762a ("leds: lp8860: Various fixes to align with LED framework")
Signed-off-by: Wang Yufen <wangyufen@huawei.com>
Cc: Dan Murphy <dmurphy@ti.com>
---
drivers/leds/leds-lp8860.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/drivers/leds/leds-lp8860.c b/drivers/leds/leds-lp8860.c
index e2b36d3..ca73d91 100644
--- a/drivers/leds/leds-lp8860.c
+++ b/drivers/leds/leds-lp8860.c
@@ -375,6 +375,11 @@ static int lp8860_init(struct lp8860_led *led)
.cache_type = REGCACHE_NONE,
};
+static void lp8860_mutex_destroy(void *lock)
+{
+ mutex_destroy(lock);
+}
+
static int lp8860_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
@@ -408,6 +413,10 @@ static int lp8860_probe(struct i2c_client *client,
led->led_dev.brightness_set_blocking = lp8860_brightness_set;
mutex_init(&led->lock);
+ ret = devm_add_action_or_reset(&client->dev, lp8860_mutex_destroy,
+ &led->lock);
+ if (ret)
+ return ret;
i2c_set_clientdata(client, led);
@@ -459,8 +468,6 @@ static void lp8860_remove(struct i2c_client *client)
dev_err(&led->client->dev,
"Failed to disable regulator\n");
}
-
- mutex_destroy(&led->lock);
}
static const struct i2c_device_id lp8860_id[] = {
--
1.8.3.1
next prev parent reply other threads:[~2022-11-09 8:28 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-09 8:48 [PATCH 00/13] leds: Fix devm vs. non-devm ordering Wang Yufen
2022-11-09 8:48 ` [PATCH 01/13] leds: cr0014114: " Wang Yufen
2022-11-09 8:48 ` [PATCH 02/13] leds: el15203000: " Wang Yufen
2022-11-09 9:39 ` Oleh Kravchenko
2022-11-09 10:25 ` wangyufen
2022-11-09 10:43 ` Oleh Kravchenko
[not found] ` <c53e4614-eb06-cda8-f9da-2ca58396df54@huawei.com>
2022-11-11 10:39 ` Oleh Kravchenko
2022-11-15 2:06 ` Wei Yongjun
2022-11-22 1:10 ` Wang Yufen
2022-11-25 22:21 ` Oleh Kravchenko
2022-11-09 8:48 ` [PATCH 03/13] leds: lm3532: " Wang Yufen
2022-11-09 8:48 ` [PATCH 04/13] leds: lm3692x: " Wang Yufen
2022-11-09 8:48 ` [PATCH 05/13] leds: lm3697: " Wang Yufen
2022-11-09 8:48 ` [PATCH 06/13] leds: lp50xx: " Wang Yufen
2022-11-09 8:48 ` Wang Yufen [this message]
2022-11-09 8:48 ` [PATCH 08/13] leds: mlxreg: " Wang Yufen
2022-11-09 8:48 ` [PATCH 09/13] leds: mt6323: " Wang Yufen
2022-11-09 8:48 ` [PATCH 10/13] leds: powernv: " Wang Yufen
2022-11-09 8:48 ` [PATCH 11/13] leds: sc27xx: " Wang Yufen
2022-11-09 8:48 ` [PATCH 12/13] leds: spi-byte: " Wang Yufen
2022-11-09 8:48 ` [PATCH 13/13] leds: rt8515: " Wang Yufen
2022-12-07 20:20 ` [PATCH 00/13] leds: " Pavel Machek
2022-12-08 2:23 ` wangyufen
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=1667983694-15040-8-git-send-email-wangyufen@huawei.com \
--to=wangyufen@huawei.com \
--cc=dmurphy@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-leds@vger.kernel.org \
--cc=pavel@ucw.cz \
/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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).