Skip to content

Commit b5e85e5

Browse files
jwrdegoedebroonie
authored andcommitted
ASoC: rt5640: Enable the IRQ on resume after configuring jack-detect
The jack-detect IRQ should be enabled *after* the jack-detect related configuration registers have been programmed. Move the enable_irq() call for this to after the register setup. Fixes: 5fabcc9 ("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-5-hdegoede@redhat.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 786120e commit b5e85e5

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

sound/soc/codecs/rt5640.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2826,8 +2826,6 @@ static int rt5640_resume(struct snd_soc_component *component)
28262826
regcache_sync(rt5640->regmap);
28272827

28282828
if (rt5640->jack) {
2829-
enable_irq(rt5640->irq);
2830-
28312829
if (rt5640->jd_src == RT5640_JD_SRC_HDA_HEADER) {
28322830
snd_soc_component_update_bits(component,
28332831
RT5640_DUMMY2, 0x1100, 0x1100);
@@ -2854,6 +2852,7 @@ static int rt5640_resume(struct snd_soc_component *component)
28542852
}
28552853
}
28562854

2855+
enable_irq(rt5640->irq);
28572856
queue_delayed_work(system_long_wq, &rt5640->jack_work, 0);
28582857
}
28592858

0 commit comments

Comments
 (0)