diff options
author | Takashi Iwai <tiwai@suse.de> | 2016-05-10 16:06:04 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2016-05-10 16:06:04 +0200 |
commit | 2e00fde5c6ed8535244332ebb55e881baa54ae46 (patch) | |
tree | f578e02ef1dc6e59630f09404bb2f58500876811 /sound/soc/codecs/arizona.c | |
parent | 39f0ccde3624e7cf882faccf7f72a47b7a763bfb (diff) | |
parent | 3231e2053eaeee70bdfb216a78a30f11e88e2243 (diff) |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'sound/soc/codecs/arizona.c')
-rw-r--r-- | sound/soc/codecs/arizona.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c index 92d22a018d68..83959312f7a0 100644 --- a/sound/soc/codecs/arizona.c +++ b/sound/soc/codecs/arizona.c @@ -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" }, |