diff options
author | Daniel J Blueman <daniel@quora.org> | 2012-12-18 10:59:33 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-12-18 11:07:11 -0500 |
commit | 44728e97c35ef31d649dafbbada665e37176f5da (patch) | |
tree | 2f1cc1b4c60974e767213f23ab73e07ba1389632 /sound | |
parent | 6ffe168f822cf7f777987cddc00ade542fd73bf0 (diff) |
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 0f3d3db0df71..cca87277baf0 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) | |||
2876 | azx_notifier_unregister(chip); | 2876 | azx_notifier_unregister(chip); |
2877 | 2877 | ||
2878 | chip->init_failed = 1; /* to be sure */ | 2878 | chip->init_failed = 1; /* to be sure */ |
2879 | complete(&chip->probe_wait); | 2879 | complete_all(&chip->probe_wait); |
2880 | 2880 | ||
2881 | if (use_vga_switcheroo(chip)) { | 2881 | if (use_vga_switcheroo(chip)) { |
2882 | if (chip->disabled && chip->bus) | 2882 | if (chip->disabled && chip->bus) |
@@ -3504,7 +3504,7 @@ static int azx_probe(struct pci_dev *pci, | |||
3504 | pm_runtime_put_noidle(&pci->dev); | 3504 | pm_runtime_put_noidle(&pci->dev); |
3505 | 3505 | ||
3506 | dev++; | 3506 | dev++; |
3507 | complete(&chip->probe_wait); | 3507 | complete_all(&chip->probe_wait); |
3508 | return 0; | 3508 | return 0; |
3509 | 3509 | ||
3510 | out_free: | 3510 | out_free: |