diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-12-02 13:32:41 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-12-02 13:32:41 +0100 |
| commit | b95ff8e61afc5b621992bdddef5bf6af2d66772a (patch) | |
| tree | 15f718fa446ce37b1d4a561b8fdd4d7c3c8854e2 /sound/pci/hda/hda_intel.c | |
| parent | 7f132927435cf09d26ceb81cd0043b542ac7206d (diff) | |
| parent | 88d071fc9a93de2916822910c927f28ed15c3a56 (diff) | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'sound/pci/hda/hda_intel.c')
| -rw-r--r-- | sound/pci/hda/hda_intel.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index dfdb96603636..486d25fa7e97 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -3876,7 +3876,8 @@ static int azx_probe(struct pci_dev *pci, } dev++; - complete_all(&chip->probe_wait); + if (chip->disabled) + complete_all(&chip->probe_wait); return 0; out_free: @@ -3953,10 +3954,10 @@ static int azx_probe_continue(struct azx *chip) if ((chip->driver_caps & AZX_DCAPS_PM_RUNTIME) || chip->use_vga_switcheroo) pm_runtime_put_noidle(&pci->dev); - return 0; - out_free: - chip->init_failed = 1; + if (err < 0) + chip->init_failed = 1; + complete_all(&chip->probe_wait); return err; } |