diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2023-09-12 13:32:45 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-09-12 15:37:51 +0200 |
| commit | 8fc7cc507d61fc655172836c74fb7fcc8b7a978b (patch) | |
| tree | fe6ad441e73bf68d7859678102bd08870ebc602b /sound | |
| parent | ASoC: rt5640: Fix IRQ not being free-ed for HDA jack detect mode (diff) | |
| download | linux-8fc7cc507d61fc655172836c74fb7fcc8b7a978b.tar.xz linux-8fc7cc507d61fc655172836c74fb7fcc8b7a978b.zip | |
ASoC: rt5640: Only cancel jack-detect work on suspend if active
If jack-detection is not used; or has already been disabled then
there is no need to call rt5640_cancel_work().
Move the rt5640_cancel_work() inside the "if (rt5640->jack) {}" block,
grouping it together with the disabling of the IRQ which queues the work
in the first place.
This also makes suspend() symetrical with resume() which re-queues the work
in an "if (rt5640->jack) {}" block.
Cc: Oder Chiou <oder_chiou@realtek.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20230912113245.320159-7-hdegoede@redhat.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/rt5640.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c index a4a11407ab10..e8cdc166bdaa 100644 --- a/sound/soc/codecs/rt5640.c +++ b/sound/soc/codecs/rt5640.c @@ -2801,9 +2801,9 @@ static int rt5640_suspend(struct snd_soc_component *component) if (rt5640->jack) { /* disable jack interrupts during system suspend */ disable_irq(rt5640->irq); + rt5640_cancel_work(rt5640); } - rt5640_cancel_work(rt5640); snd_soc_component_force_bias_level(component, SND_SOC_BIAS_OFF); rt5640_reset(component); regcache_cache_only(rt5640->regmap, true); |