@@ -456,6 +456,11 @@ static int lm3692x_probe_dt(struct lm3692x_led *led)
return ret;
}
+static void lm3692x_mutex_destroy(void *lock)
+{
+ mutex_destroy(lock);
+}
+
static int lm3692x_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
@@ -472,6 +477,11 @@ static int lm3692x_probe(struct i2c_client *client,
led->model_id = id->driver_data;
i2c_set_clientdata(client, led);
+ ret = devm_add_action_or_reset(&client->dev, lm3692x_mutex_destroy,
+ &led->lock);
+ if (ret)
+ return ret;
+
led->regmap = devm_regmap_init_i2c(client, &lm3692x_regmap_config);
if (IS_ERR(led->regmap)) {
ret = PTR_ERR(led->regmap);
@@ -496,7 +506,6 @@ static void lm3692x_remove(struct i2c_client *client)
struct lm3692x_led *led = i2c_get_clientdata(client);
lm3692x_leds_disable(led);
- mutex_destroy(&led->lock);
}
static const struct i2c_device_id lm3692x_id[] = {
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: 9699cb6bbef2 ("leds: lm3692x: Introduce LM3692x dual string driver") Signed-off-by: Wang Yufen <wangyufen@huawei.com> Cc: Dan Murphy <dmurphy@ti.com> --- drivers/leds/leds-lm3692x.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)