aboutsummaryrefslogtreecommitdiff
path: root/sound/pci/hda/hda_intel.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-06-19 07:34:14 -1000
committerLinus Torvalds <torvalds@linux-foundation.org>2015-06-19 07:34:14 -1000
commit9a10758c4475ea9576a62828b6097dcf79f6d3e2 (patch)
tree15cba175627ab9c349956d69d4bd5be9f6e7efc4 /sound/pci/hda/hda_intel.c
parente640a280ccb9c448a3d9d522ea730ce00efa8cf0 (diff)
parent145c0e914d2cd0cf829b8c4cbe24736b3ee81a91 (diff)
downloadlinux-9a10758c4475ea9576a62828b6097dcf79f6d3e2.tar.gz
Merge tag 'sound-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai: "Nothing looks scary, just a few usual HD-audio regression fixes and fixup, in addition to a minor Kconfig dependency fix for the old MIPS drivers" * tag 'sound-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: ALSA: hda - Fix unused label skip_i915 ALSA: hda - Fix noisy outputs on Dell XPS13 (2015 model) ALSA: mips: let SND_SGI_O2 select SND_PCM ALSA: hda - Fix audio crackles on Dell Latitude E7x40 ALSA: hda - adding a DAC/pin preference map for a HP Envy TS machine
Diffstat (limited to 'sound/pci/hda/hda_intel.c')
-rw-r--r--sound/pci/hda/hda_intel.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index a244ba706317..b6db25b23dd3 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -1879,7 +1879,9 @@ static int azx_probe_continue(struct azx *chip)
#endif
}
+#ifdef CONFIG_SND_HDA_I915
skip_i915:
+#endif
err = azx_first_init(chip);
if (err < 0)
goto out_free;