diff options
author | Daniel J Blueman <daniel@quora.org> | 2012-12-18 23:59:33 +0800 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-12-18 17:07:11 +0100 |
commit | 44728e97c35ef31d649dafbbada665e37176f5da (patch) | |
tree | 2f1cc1b4c60974e767213f23ab73e07ba1389632 /sound | |
parent | 6ffe168f822cf7f777987cddc00ade542fd73bf0 (diff) | |
download | op-kernel-dev-44728e97c35ef31d649dafbbada665e37176f5da.zip op-kernel-dev-44728e97c35ef31d649dafbbada665e37176f5da.tar.gz |
ALSA: HDA: Fix sound resume hang
Resuming a switcheroo'd HDA controller hangs since the completion
is one-shot (thus works the first time). Fix by using completions
that explictly need rearming, so remain fired before.
Signed-off-by: Daniel J Blueman <daniel@quora.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/pci/hda/hda_intel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 0f3d3db..cca8727 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -2876,7 +2876,7 @@ static int azx_free(struct azx *chip) azx_notifier_unregister(chip); chip->init_failed = 1; /* to be sure */ - complete(&chip->probe_wait); + complete_all(&chip->probe_wait); if (use_vga_switcheroo(chip)) { if (chip->disabled && chip->bus) @@ -3504,7 +3504,7 @@ static int azx_probe(struct pci_dev *pci, pm_runtime_put_noidle(&pci->dev); dev++; - complete(&chip->probe_wait); + complete_all(&chip->probe_wait); return 0; out_free: |