Unverified Commit 786120eb authored Sep 12, 2023 by Hans de Goede Committed by Mark Brown Sep 12, 2023

ASoC: rt5640: Do not disable/enable IRQ twice on suspend/resume



When jack-detect was originally added disabling the IRQ during suspend
was done by the sound/soc/intel/boards/bytcr_rt5640.c driver
calling snd_soc_component_set_jack(NULL) on suspend, which calls
rt5640_disable_jack_detect(), which calls free_irq() which also
disables it.

Commit 5fabcc90 ("ASoC: rt5640: Fix Jack work after system suspend")
added disable_irq() / enable_irq() calls on suspend/resume for machine
drivers which do not call snd_soc_component_set_jack(NULL) on suspend.

The new disable_irq() / enable_irq() are made conditional by
"if (rt5640->irq)" statements, but this is true for the machine drivers
which do call snd_soc_component_set_jack(NULL) on suspend too, causing
a disable_irq() call there on the already free-ed IRQ.

Change the "if (rt5640->irq)" condition to "if (rt5640->jack)" to fix this,
rt5640->jack is only set if the jack-detect IRQ handler is still active
when rt5640_suspend() runs.

And adjust rt5640_enable_hda_jack_detect()'s request_irq() error handling
to set rt5640->jack to NULL to match (note that the old setting of irq to
-ENOXIO still resulted in disable_irq(-ENOXIO) calls on suspend).

Fixes: 5fabcc90 ("ASoC: rt5640: Fix Jack work after system suspend")
Cc: Oder Chiou <oder_chiou@realtek.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20230912113245.320159-4-hdegoede@redhat.com


Signed-off-by: Mark Brown <broonie@kernel.org>

parent df7d595f

sound/soc/codecs/rt5640.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -2622,7 +2622,7 @@ static void rt5640_enable_hda_jack_detect(
		IRQF_TRIGGER_RISING \| IRQF_ONESHOT, "rt5640", rt5640);
		if (ret) {
		dev_warn(component->dev, "Failed to request IRQ %d: %d\n", rt5640->irq, ret);
		rt5640->irq = -ENXIO;
		rt5640->jack = NULL;
		return;
		}

		@@ -2797,7 +2797,7 @@ static int rt5640_suspend(struct snd_soc_component *component)
		{
		struct rt5640_priv *rt5640 = snd_soc_component_get_drvdata(component);

		if (rt5640->irq) {
		if (rt5640->jack) {
		/* disable jack interrupts during system suspend */
		disable_irq(rt5640->irq);
		}
		@@ -2825,10 +2825,9 @@ static int rt5640_resume(struct snd_soc_component *component)
		regcache_cache_only(rt5640->regmap, false);
		regcache_sync(rt5640->regmap);

		if (rt5640->irq)
		if (rt5640->jack) {
		enable_irq(rt5640->irq);

		if (rt5640->jack) {
		if (rt5640->jd_src == RT5640_JD_SRC_HDA_HEADER) {
		snd_soc_component_update_bits(component,
		RT5640_DUMMY2, 0x1100, 0x1100);