Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
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>,
        Oleh Kravchenko <oleg@kaa.org.ua>
Subject: [PATCH 01/13] leds: cr0014114: Fix devm vs. non-devm ordering
Date:   Wed, 9 Nov 2022 16:48:02 +0800
Message-ID: <1667983694-15040-2-git-send-email-wangyufen@huawei.com>
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
Content-Type: text/plain
Precedence: bulk

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: 9e50d5fb0d18 ("leds: add LED driver for CR0014114 board")
Signed-off-by: Wang Yufen <wangyufen@huawei.com>
Cc: Oleh Kravchenko <oleg@kaa.org.ua>
---
 drivers/leds/leds-cr0014114.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/drivers/leds/leds-cr0014114.c b/drivers/leds/leds-cr0014114.c
index c87686b..f3a0320 100644
--- a/drivers/leds/leds-cr0014114.c
+++ b/drivers/leds/leds-cr0014114.c
@@ -211,6 +211,11 @@ static int cr0014114_probe_dt(struct cr0014114 *priv)
 	return 0;
 }
 
+static void cr0014114_mutex_destroy(void *lock)
+{
+	mutex_destroy(lock);
+}
+
 static int cr0014114_probe(struct spi_device *spi)
 {
 	struct cr0014114	*priv;
@@ -240,6 +245,11 @@ static int cr0014114_probe(struct spi_device *spi)
 	priv->delay	= jiffies -
 			  msecs_to_jiffies(CR_FW_DELAY_MSEC);
 
+	ret = devm_add_action_or_reset(&spi->dev, cr0014114_mutex_destroy,
+				       &priv->lock);
+	if (ret)
+		return ret;
+
 	priv->do_recount = true;
 	ret = cr0014114_sync(priv);
 	if (ret) {
@@ -271,7 +281,6 @@ static void cr0014114_remove(struct spi_device *spi)
 	struct cr0014114 *priv = spi_get_drvdata(spi);
 
 	cancel_delayed_work_sync(&priv->work);
-	mutex_destroy(&priv->lock);
 }
 
 static const struct of_device_id cr0014114_dt_ids[] = {
-- 
1.8.3.1