diff options
| author | Takashi Iwai <tiwai@suse.de> | 2018-09-04 20:23:29 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2018-09-04 20:23:40 +0200 |
| commit | 70f7922c25cfb4cc7757f0964919d7d87e2ba250 (patch) | |
| tree | 502b13ee7e9c764363da1a7353f7d948e11df691 /sound/pci/hda/hda_codec.c | |
| parent | ALSA: aoa: Convert to using %pOFn instead of device_node.name (diff) | |
| parent | ALSA: mips: Cleanup indirect PCM helper usages (diff) | |
| download | linux-70f7922c25cfb4cc7757f0964919d7d87e2ba250.tar.xz linux-70f7922c25cfb4cc7757f0964919d7d87e2ba250.zip | |
Merge branch 'topic/pcm-indirect-fixes' into for-next
Signed-off-by: Takashi Iwai <tiwai@suse.de>
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 ccbb0d12b8cc..0957813939e5 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -3935,7 +3935,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); |