projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fix/hda' into for-linus
[cascardo/linux.git]
/
sound
/
pci
/
hda
/
patch_via.c
diff --git
a/sound/pci/hda/patch_via.c
b/sound/pci/hda/patch_via.c
index
71f7845
..
a76c326
100644
(file)
--- a/
sound/pci/hda/patch_via.c
+++ b/
sound/pci/hda/patch_via.c
@@
-263,8
+263,7
@@
static void vt1708_stop_hp_work(struct via_spec *spec)
return;
snd_hda_codec_write(spec->codec, 0x1, 0, 0xf81,
!spec->vt1708_jack_detectect);
- cancel_delayed_work(&spec->vt1708_hp_work);
- flush_scheduled_work();
+ cancel_delayed_work_sync(&spec->vt1708_hp_work);
}