Unverified Commit 04268bf2 authored Jun 05, 2019 by Amadeusz Sławiński Committed by Mark Brown Jun 06, 2019

SoC: rt274: Fix internal jack assignment in set_jack callback



When we call snd_soc_component_set_jack(component, NULL, NULL) we should
set rt274->jack to passed jack, so when interrupt is triggered it calls
snd_soc_jack_report(rt274->jack, ...) with proper value.

This fixes problem in machine where in register, we call
snd_soc_register(component, &headset, NULL), which just calls
rt274_mic_detect via callback.
Now when machine driver is removed "headset" will be gone, so we
need to tell codec driver that it's gone with:
snd_soc_register(component, NULL, NULL), but we also need to be able
to handle NULL jack argument here gracefully.
If we don't set it to NULL, next time the rt274_irq runs it will call
snd_soc_jack_report with first argument being invalid pointer and there
will be Oops.

Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

parent 6d647b73

sound/soc/codecs/rt274.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -405,6 +405,8 @@ static int rt274_mic_detect(struct snd_soc_component *component,
		{
		struct rt274_priv *rt274 = snd_soc_component_get_drvdata(component);

		rt274->jack = jack;

		if (jack == NULL) {
		/* Disable jack detection */
		regmap_update_bits(rt274->regmap, RT274_EAPD_GPIO_IRQ_CTRL,
		@@ -412,7 +414,6 @@ static int rt274_mic_detect(struct snd_soc_component *component,

		return 0;
		}
		rt274->jack = jack;

		regmap_update_bits(rt274->regmap, RT274_EAPD_GPIO_IRQ_CTRL,
		RT274_IRQ_EN, RT274_IRQ_EN);