summaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorDavid Henningsson <david.henningsson@canonical.com>2013-08-19 13:32:30 +0200
committerTakashi Iwai <tiwai@suse.de>2013-08-19 15:46:17 +0200
commitc841ad2a9b86c7317dc7e4fe4e03bc56a6c0d6e8 (patch)
treecdca7dc619ea3eb5347d4288c4f3a5638e1806ce /sound/pci
parentcd5302c0d4b79bef7660bb4be300d169e38f39c3 (diff)
downloadop-kernel-dev-c841ad2a9b86c7317dc7e4fe4e03bc56a6c0d6e8.zip
op-kernel-dev-c841ad2a9b86c7317dc7e4fe4e03bc56a6c0d6e8.tar.gz
ALSA: hda - Try to allow haswell HDMI audio even without powerwell
If compiled without CONFIG_SND_HDA_I915, the audio driver cannot request power well. However, if the power well is on for other reasons, maybe audio can still work. Therefore, do not skip the card completely if compiled without CONFIG_SND_HDA_I915. Signed-off-by: David Henningsson <david.henningsson@canonical.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-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 7f9e406..c6c9829 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -3855,11 +3855,13 @@ static int azx_probe_continue(struct azx *chip)
/* Request power well for Haswell HDA controller and codec */
if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) {
+#ifdef CONFIG_SND_HDA_I915
err = hda_i915_init();
if (err < 0) {
snd_printk(KERN_ERR SFX "Error request power-well from i915\n");
goto out_free;
}
+#endif
hda_display_power(true);
}
OpenPOWER on IntegriCloud