diff options
author | Takashi Iwai <tiwai@suse.de> | 2019-02-08 14:22:45 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2019-02-08 14:22:57 +0100 |
commit | 7b48b3b2263c275168b6c6192d487d939c097e8d (patch) | |
tree | 43368b4b44e118f504289509dcadb188b66f4025 /sound/pci/hda/hda_intel.c | |
parent | d02cac152c97dffcb0cdd91e09b54fd6e2cca63d (diff) | |
parent | 0a5cf9e88b5178d15f00f3cf35081841d80403cd (diff) |
Merge branch 'for-linus' into for-next
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_intel.c')
-rw-r--r-- | sound/pci/hda/hda_intel.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index e784130ea4e0..e5c49003e75f 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -2185,6 +2185,7 @@ static int azx_probe_continue(struct azx *chip) int dev = chip->dev_index; int err; + to_hda_bus(bus)->bus_probing = 1; hda->probe_continued = 1; /* bind with i915 if needed */ @@ -2269,6 +2270,7 @@ out_free: if (err < 0) hda->init_failed = 1; complete_all(&hda->probe_wait); + to_hda_bus(bus)->bus_probing = 0; return err; } |