From: Chancel Liu <chancel.liu@oss.nxp.com>
To: Mark Brown <broonie@kernel.org>,
Liam Girdwood <lgirdwood@gmail.com>,
Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>,
Charles Keepax <ckeepax@opensource.cirrus.com>,
Oder Chiou <oder_chiou@realtek.com>
Cc: Support Opensource <support.opensource@diasemi.com>,
linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org,
patches@opensource.cirrus.com
Subject: [PATCH 21/21] ASoC: rt5514-spi: Free the DSP context on component remove
Date: Mon, 21 Sep 2026 19:46:40 +0900 [thread overview]
Message-ID: <20260921104640.1941554-22-chancel.liu@oss.nxp.com> (raw)
In-Reply-To: <20260921104640.1941554-1-chancel.liu@oss.nxp.com>
From: Chancel Liu <chancel.liu@nxp.com>
component->dev is the underlying SPI bus device, whose devres lifetime
follows the physical device's probe/remove rather than the ASoC card's
bind/unbind. The rt5514_dsp context was allocated in
rt5514_spi_pcm_probe() via devm_kzalloc(component->dev, ...) and its
delayed work and wakeup source were never torn down on component remove,
so the context leaked and the pending copy work / wakeup source were
left dangling on every card bind/unbind cycle.
Allocate the context with plain kzalloc() and add a component .remove
callback that cancels the copy work, undoes device_init_wakeup(),
destroys the mutex and frees the context. The threaded IRQ is requested
with the non-devm request_irq() API and freed explicitly in component
.remove.
Signed-off-by: Chancel Liu <chancel.liu@nxp.com>
---
sound/soc/codecs/rt5514-spi.c | 37 ++++++++++++++++++++++++++---------
1 file changed, 28 insertions(+), 9 deletions(-)
diff --git a/sound/soc/codecs/rt5514-spi.c b/sound/soc/codecs/rt5514-spi.c
index 91290bfe8daa..b7b48a9141ee 100644
--- a/sound/soc/codecs/rt5514-spi.c
+++ b/sound/soc/codecs/rt5514-spi.c
@@ -257,8 +257,7 @@ static int rt5514_spi_pcm_probe(struct snd_soc_component *component)
struct rt5514_dsp *rt5514_dsp;
int ret;
- rt5514_dsp = devm_kzalloc(component->dev, sizeof(*rt5514_dsp),
- GFP_KERNEL);
+ rt5514_dsp = kzalloc_obj(*rt5514_dsp);
if (!rt5514_dsp)
return -ENOMEM;
@@ -268,21 +267,40 @@ static int rt5514_spi_pcm_probe(struct snd_soc_component *component)
snd_soc_component_set_drvdata(component, rt5514_dsp);
if (rt5514_spi->irq) {
- ret = devm_request_threaded_irq(&rt5514_spi->dev,
- rt5514_spi->irq, NULL, rt5514_spi_irq,
- IRQF_TRIGGER_RISING | IRQF_ONESHOT, "rt5514-spi",
- rt5514_dsp);
- if (ret)
+ ret = request_threaded_irq(rt5514_spi->irq, NULL,
+ rt5514_spi_irq,
+ IRQF_TRIGGER_RISING | IRQF_ONESHOT,
+ "rt5514-spi", rt5514_dsp);
+ if (ret) {
dev_err(&rt5514_spi->dev,
"%s Failed to request IRQ: %d\n", __func__,
ret);
- else
- device_init_wakeup(rt5514_dsp->dev, true);
+ kfree(rt5514_dsp);
+ return ret;
+ }
+
+ device_init_wakeup(rt5514_dsp->dev, true);
}
return 0;
}
+static void rt5514_spi_pcm_remove(struct snd_soc_component *component)
+{
+ struct rt5514_dsp *rt5514_dsp =
+ snd_soc_component_get_drvdata(component);
+
+ if (rt5514_spi->irq) {
+ free_irq(rt5514_spi->irq, rt5514_dsp);
+ device_init_wakeup(rt5514_dsp->dev, false);
+ }
+
+ cancel_delayed_work_sync(&rt5514_dsp->copy_work);
+
+ mutex_destroy(&rt5514_dsp->dma_lock);
+ kfree(rt5514_dsp);
+}
+
static int rt5514_spi_pcm_new(struct snd_soc_component *component,
struct snd_soc_pcm_runtime *rtd)
{
@@ -294,6 +312,7 @@ static int rt5514_spi_pcm_new(struct snd_soc_component *component,
static const struct snd_soc_component_driver rt5514_spi_component = {
.name = DRV_NAME,
.probe = rt5514_spi_pcm_probe,
+ .remove = rt5514_spi_pcm_remove,
.open = rt5514_spi_pcm_open,
.hw_params = rt5514_spi_hw_params,
.hw_free = rt5514_spi_hw_free,
--
2.50.1
next prev parent reply other threads:[~2026-09-21 10:49 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-21 10:46 [PATCH 00/21] ASoC: codecs: Fix resource leaks across card bind/unbind Chancel Liu
2026-09-21 10:46 ` [PATCH 01/21] ASoC: cpcap: Fix devm " Chancel Liu
2026-09-21 10:46 ` [PATCH 02/21] ASoC: da7218: " Chancel Liu
2026-09-21 10:46 ` [PATCH 03/21] ASoC: tlv320aic32x4: Fix clock leak from runtime callbacks Chancel Liu
2026-09-21 10:46 ` [PATCH 04/21] ASoC: twl4030: Acquire board params and hs_extmute GPIO in the platform probe Chancel Liu
2026-09-21 10:46 ` [PATCH 05/21] ASoC: es8316: Move mclk acquisition to the i2c probe Chancel Liu
2026-09-21 10:46 ` [PATCH 06/21] ASoC: es8323: " Chancel Liu
2026-09-21 13:17 ` Mark Brown
2026-09-21 13:18 ` Mark Brown
2026-09-22 2:18 ` Chancel Liu
2026-09-21 10:46 ` [PATCH 07/21] ASoC: es8311: " Chancel Liu
2026-09-21 10:46 ` [PATCH 08/21] ASoC: es8328: Move clk acquisition to the bus probe Chancel Liu
2026-09-21 10:46 ` [PATCH 09/21] ASoC: rt5640: Move mclk acquisition to the i2c probe Chancel Liu
2026-09-21 18:28 ` Cezary Rojewski
2026-09-21 10:46 ` [PATCH 10/21] ASoC: rt5616: " Chancel Liu
2026-09-21 10:46 ` [PATCH 11/21] ASoC: rt5514: Move clk " Chancel Liu
2026-09-21 10:46 ` [PATCH 12/21] ASoC: rt5682s: Move mclk " Chancel Liu
2026-09-21 18:44 ` Cezary Rojewski
2026-09-22 2:34 ` Chancel Liu
2026-09-21 10:46 ` [PATCH 13/21] ASoC: max98090: " Chancel Liu
2026-09-21 10:46 ` [PATCH 14/21] ASoC: max98095: " Chancel Liu
2026-09-21 10:46 ` [PATCH 15/21] ASoC: wm8985: Move regulator acquisition to the bus probe Chancel Liu
2026-09-21 11:52 ` Charles Keepax
2026-09-22 2:01 ` Chancel Liu
2026-09-21 10:46 ` [PATCH 16/21] ASoC: wm8955: Move regulator acquisition to the i2c probe Chancel Liu
2026-09-21 10:58 ` Charles Keepax
2026-09-21 10:46 ` [PATCH 17/21] ASoC: es8389: Move regulator and mclk " Chancel Liu
2026-09-21 10:46 ` [PATCH 18/21] ASoC: rt5677-spi: Free the DSP context on component remove Chancel Liu
2026-09-21 10:46 ` [PATCH 19/21] ASoC: rt1011: Free the bq/drc coefficient arrays " Chancel Liu
2026-09-21 10:46 ` [PATCH 20/21] ASoC: rt5645: Free the hardware EQ parameters " Chancel Liu
2026-09-21 10:46 ` Chancel Liu [this message]
2026-09-21 13:23 ` [PATCH 21/21] ASoC: rt5514-spi: Free the DSP context " Mark Brown
2026-09-22 2:31 ` Chancel Liu
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=20260921104640.1941554-22-chancel.liu@oss.nxp.com \
--to=chancel.liu@oss.nxp.com \
--cc=broonie@kernel.org \
--cc=ckeepax@opensource.cirrus.com \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=oder_chiou@realtek.com \
--cc=patches@opensource.cirrus.com \
--cc=perex@perex.cz \
--cc=support.opensource@diasemi.com \
--cc=tiwai@suse.com \
/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
all inboxes | Powered by JetHome®