From patchwork Wed Nov 9 08:48:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wangyufen X-Patchwork-Id: 623206 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 9B21CC43217 for ; Wed, 9 Nov 2022 08:28:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229911AbiKII2D (ORCPT ); Wed, 9 Nov 2022 03:28:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40136 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229861AbiKII1y (ORCPT ); Wed, 9 Nov 2022 03:27:54 -0500 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2DCB513E9E; Wed, 9 Nov 2022 00:27:53 -0800 (PST) Received: from canpemm500010.china.huawei.com (unknown [172.30.72.57]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4N6dPl0SP1z15MVD; Wed, 9 Nov 2022 16:27:39 +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:51 +0800 From: Wang Yufen To: , CC: , Wang Yufen , Dan Murphy Subject: [PATCH 06/13] leds: lp50xx: Fix devm vs. non-devm ordering Date: Wed, 9 Nov 2022 16:48:07 +0800 Message-ID: <1667983694-15040-7-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: 242b81170fb8 ("leds: lp50xx: Add the LP50XX family of the RGB LED driver") Signed-off-by: Wang Yufen Cc: Dan Murphy --- drivers/leds/leds-lp50xx.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/leds/leds-lp50xx.c b/drivers/leds/leds-lp50xx.c index 28d6b39..fcec568e 100644 --- a/drivers/leds/leds-lp50xx.c +++ b/drivers/leds/leds-lp50xx.c @@ -521,6 +521,11 @@ static int lp50xx_probe_dt(struct lp50xx *priv) return ret; } +static void lp50xx_mutex_destroy(void *lock) +{ + mutex_destroy(lock); +} + static int lp50xx_probe(struct i2c_client *client) { struct lp50xx *led; @@ -539,6 +544,11 @@ static int lp50xx_probe(struct i2c_client *client) return -ENOMEM; mutex_init(&led->lock); + ret = devm_add_action_or_reset(&client->dev, lp50xx_mutex_destroy, + &led->lock); + if (ret) + return ret; + led->client = client; led->dev = &client->dev; led->chip_info = device_get_match_data(&client->dev); @@ -577,8 +587,6 @@ static void lp50xx_remove(struct i2c_client *client) if (ret) dev_err(led->dev, "Failed to disable regulator\n"); } - - mutex_destroy(&led->lock); } static const struct i2c_device_id lp50xx_id[] = {