Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54dca701 authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

ASoC: arizona: Free speaker thermal IRQs in CODEC remove 



The thermal warning IRQs for the speaker are requested in CODEC probe
but never freed. This patch frees them in CODEC remove.

Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent f55532a0

sound/soc/codecs/arizona.c

+12 −0
Original line number Diff line number Diff line
@@ -249,6 +249,18 @@ int arizona_init_spk(struct snd_soc_codec *codec) 
}

EXPORT_SYMBOL_GPL(arizona_init_spk);



int arizona_free_spk(struct snd_soc_codec *codec)

{

	struct arizona_priv *priv = snd_soc_codec_get_drvdata(codec);

	struct arizona *arizona = priv->arizona;



	arizona_free_irq(arizona, ARIZONA_IRQ_SPK_OVERHEAT_WARN, arizona);

	arizona_free_irq(arizona, ARIZONA_IRQ_SPK_OVERHEAT, arizona);



	return 0;

}

EXPORT_SYMBOL_GPL(arizona_free_spk);



static const struct snd_soc_dapm_route arizona_mono_routes[] = {

	{ "OUT1R", NULL, "OUT1L" },

	{ "OUT2R", NULL, "OUT2L" },

sound/soc/codecs/arizona.h

+2 −0
Original line number Diff line number Diff line
@@ -307,6 +307,8 @@ extern int arizona_init_spk(struct snd_soc_codec *codec); 
extern int arizona_init_gpio(struct snd_soc_codec *codec);

extern int arizona_init_mono(struct snd_soc_codec *codec);



extern int arizona_free_spk(struct snd_soc_codec *codec);



extern int arizona_init_dai(struct arizona_priv *priv, int dai);



int arizona_set_output_mode(struct snd_soc_codec *codec, int output,

sound/soc/codecs/cs47l24.c

+3 −0
Original line number Diff line number Diff line
@@ -1108,6 +1108,9 @@ static int cs47l24_codec_remove(struct snd_soc_codec *codec) 
	priv->core.arizona->dapm = NULL;



	arizona_free_irq(arizona, ARIZONA_IRQ_DSP_IRQ1, priv);



	arizona_free_spk(codec);



	return 0;

}

sound/soc/codecs/wm5102.c

+2 −0
Original line number Diff line number Diff line
@@ -1960,6 +1960,8 @@ static int wm5102_codec_remove(struct snd_soc_codec *codec) 


	priv->core.arizona->dapm = NULL;



	arizona_free_spk(codec);



	return 0;

}

sound/soc/codecs/wm5110.c

+2 −0
Original line number Diff line number Diff line
@@ -2298,6 +2298,8 @@ static int wm5110_codec_remove(struct snd_soc_codec *codec) 


	arizona_free_irq(arizona, ARIZONA_IRQ_DSP_IRQ1, priv);



	arizona_free_spk(codec);



	return 0;

}