ASoC: rt5640: Only cancel jack-detect work on suspend if active

Browse source

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>

...

This commit is contained in:

Hans de Goede 2023-09-12 13:32:45 +02:00 • committed by Mark Brown

parent 8c8bf3df6b

commit 8fc7cc507d

No known key found for this signature in database

GPG key ID: 24D68B725D5487D0

1 changed files with 1 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

sound/soc/codecs/rt5640.c

View file