diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2023-09-12 13:32:43 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-09-12 15:37:49 +0200 |
| commit | b5e85e535551bf82242aa5896e14a136ed3c156d (patch) | |
| tree | 28971336422553b19ce40c9ddb71942e1d00c434 /sound/soc | |
| parent | ASoC: rt5640: Do not disable/enable IRQ twice on suspend/resume (diff) | |
| download | linux-b5e85e535551bf82242aa5896e14a136ed3c156d.tar.xz linux-b5e85e535551bf82242aa5896e14a136ed3c156d.zip | |
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: 5fabcc90e79b ("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>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/rt5640.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c index 1bc281d42ca8..03c866c04c7a 100644 --- a/sound/soc/codecs/rt5640.c +++ b/sound/soc/codecs/rt5640.c @@ -2826,8 +2826,6 @@ static int rt5640_resume(struct snd_soc_component *component) regcache_sync(rt5640->regmap); if (rt5640->jack) { - enable_irq(rt5640->irq); - if (rt5640->jd_src == RT5640_JD_SRC_HDA_HEADER) { snd_soc_component_update_bits(component, RT5640_DUMMY2, 0x1100, 0x1100); @@ -2854,6 +2852,7 @@ static int rt5640_resume(struct snd_soc_component *component) } } + enable_irq(rt5640->irq); queue_delayed_work(system_long_wq, &rt5640->jack_work, 0); } |