diff options
| author | Mark Brown <broonie@kernel.org> | 2018-12-21 09:57:36 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-12-21 09:57:36 +0000 |
| commit | 43603a35574c2e594f9e10a97a40874d1282dd7e (patch) | |
| tree | a814e05e3d87e221339e4fc9b5e2bd202faee716 /sound/pci/hda/hda_codec.c | |
| parent | 38f53ef7bce9f848946a2ad4874d715186e32144 (diff) | |
| parent | 1b2dbf3c8689071ab54298f1f999f092bb0b2410 (diff) | |
Merge tag 'v4.9.145-rt124' into linux-linaro-lsk-v4.9-rt
Linux 4.9.145-rt124
Diffstat (limited to 'sound/pci/hda/hda_codec.c')
| -rw-r--r-- | sound/pci/hda/hda_codec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index e46c561a8c90..c6b046ddefdd 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -4025,7 +4025,8 @@ void snd_hda_bus_reset_codecs(struct hda_bus *bus) list_for_each_codec(codec, bus) { /* FIXME: maybe a better way needed for forced reset */ - cancel_delayed_work_sync(&codec->jackpoll_work); + if (current_work() != &codec->jackpoll_work.work) + cancel_delayed_work_sync(&codec->jackpoll_work); #ifdef CONFIG_PM if (hda_codec_is_power_on(codec)) { hda_call_codec_suspend(codec); |