summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorCharles Keepax <ckeepax@opensource.wolfsonmicro.com>2016-04-15 13:11:57 +0100
committerMark Brown <broonie@kernel.org>2016-04-15 18:01:02 +0100
commitab9f87c413c297cb9e7d544e0e634aaadc7fb87d (patch)
treefc78e08829db5744c1cca77c7c3ac36013c497f5 /sound
parent54dca7015a7d6c09d34623c6ec61de30896186dd (diff)
downloadblackbird-op-linux-ab9f87c413c297cb9e7d544e0e634aaadc7fb87d.tar.gz
blackbird-op-linux-ab9f87c413c297cb9e7d544e0e634aaadc7fb87d.zip
ASoC: wm5102: Free compressed IRQ in CODEC remove
We request one of the DSP IRQs during CODEC probe, as such we should free it during CODEC remove, this patch does so. Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/wm5102.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c
index 59fd3e8bf899..1bae17ee8817 100644
--- a/sound/soc/codecs/wm5102.c
+++ b/sound/soc/codecs/wm5102.c
@@ -1955,11 +1955,14 @@ err_adsp2_codec_probe:
static int wm5102_codec_remove(struct snd_soc_codec *codec)
{
struct wm5102_priv *priv = snd_soc_codec_get_drvdata(codec);
+ struct arizona *arizona = priv->core.arizona;
wm_adsp2_codec_remove(&priv->core.adsp[0], codec);
priv->core.arizona->dapm = NULL;
+ arizona_free_irq(arizona, ARIZONA_IRQ_DSP_IRQ1, priv);
+
arizona_free_spk(codec);
return 0;
OpenPOWER on IntegriCloud