diff options
| author | Wang Xingchao <xingchao.wang@linux.intel.com> | 2013-07-26 05:34:44 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-07-29 14:19:03 +0200 |
| commit | 7eaa9161edd1bb41c026db252bb7e7dfe97ab90a (patch) | |
| tree | d42ddf1fc85c8df33255015f58962b5458fecf43 | |
| parent | ALSA: usx2y: remove an unneeded check (diff) | |
| download | linux-7eaa9161edd1bb41c026db252bb7e7dfe97ab90a.tar.xz linux-7eaa9161edd1bb41c026db252bb7e7dfe97ab90a.zip | |
ALSA: hda - Clearing jackpoll_interval avoid pending work
Clearing jackpoll_interval before calling cancel_delayed_work_sync(),
otherwise the work will be triggered again and cause impact in
hda_jackpoll_work(). The next patch will poll jack once even with
jackpoll_interval=0.
Signed-off-by: Wang Xingchao <xingchao.wang@linux.intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | sound/pci/hda/patch_via.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c index e2481baddc70..0bc20ef5687a 100644 --- a/sound/pci/hda/patch_via.c +++ b/sound/pci/hda/patch_via.c @@ -207,9 +207,9 @@ static void vt1708_stop_hp_work(struct hda_codec *codec) return; if (spec->hp_work_active) { snd_hda_codec_write(codec, 0x1, 0, 0xf81, 1); + codec->jackpoll_interval = 0; cancel_delayed_work_sync(&codec->jackpoll_work); spec->hp_work_active = false; - codec->jackpoll_interval = 0; } } |