From patchwork Wed Nov 9 08:48:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wangyufen X-Patchwork-Id: 623505 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C4DC8C4332F for ; Wed, 9 Nov 2022 08:28:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229903AbiKII14 (ORCPT ); Wed, 9 Nov 2022 03:27:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40124 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229850AbiKII1x (ORCPT ); Wed, 9 Nov 2022 03:27:53 -0500 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 07D8013D63; Wed, 9 Nov 2022 00:27:52 -0800 (PST) Received: from canpemm500010.china.huawei.com (unknown [172.30.72.55]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4N6dPj35N4zmVlR; Wed, 9 Nov 2022 16:27:37 +0800 (CST) Received: from localhost.localdomain (10.175.112.70) by canpemm500010.china.huawei.com (7.192.105.118) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Wed, 9 Nov 2022 16:27:49 +0800 From: Wang Yufen To: , CC: , Wang Yufen , Dan Murphy Subject: [PATCH 04/13] leds: lm3692x: Fix devm vs. non-devm ordering Date: Wed, 9 Nov 2022 16:48:05 +0800 Message-ID: <1667983694-15040-5-git-send-email-wangyufen@huawei.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1667983694-15040-1-git-send-email-wangyufen@huawei.com> References: <1667983694-15040-1-git-send-email-wangyufen@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.112.70] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To canpemm500010.china.huawei.com (7.192.105.118) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-leds@vger.kernel.org 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 Cc: Dan Murphy --- drivers/leds/leds-lm3692x.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/leds/leds-lm3692x.c b/drivers/leds/leds-lm3692x.c index 54b4662..aa1b0cc 100644 --- a/drivers/leds/leds-lm3692x.c +++ b/drivers/leds/leds-lm3692x.c @@ -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[] = {