diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-06-11 06:52:31 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-06-11 06:52:31 +0200 |
| commit | 4af88a9c1ba2d39263eef003ea598c657014e59e (patch) | |
| tree | 0470cb215c77b91147f23f55c63a733e3628a8cb /sound/pci | |
| parent | ALSA: hda - Allow calling snd_hdac_i915_*() without actual binding (diff) | |
| parent | ALSA: hda - Continue probing even if i915 binding fails (diff) | |
| download | linux-4af88a9c1ba2d39263eef003ea598c657014e59e.tar.xz linux-4af88a9c1ba2d39263eef003ea598c657014e59e.zip | |
Merge branch 'for-linus' into for-next
This merges and resolves the non-trivial conflicts with the recent fix
for hda-i915 binding fallback.
Conflicts:
sound/pci/hda/hda_intel.c
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
| -rw-r--r-- | sound/pci/hda/hda_intel.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 7933fb00da4f..3738363e8ee1 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -1987,7 +1987,7 @@ static int azx_probe_continue(struct azx *chip) err = snd_hdac_i915_init(bus); if (err < 0) - goto i915_power_fail; + goto skip_i915; err = snd_hdac_display_power(bus, true); if (err < 0) { @@ -1997,6 +1997,7 @@ static int azx_probe_continue(struct azx *chip) } } + skip_i915: err = azx_first_init(chip); if (err < 0) goto out_free; |