aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Henningsson <david.henningsson@canonical.com>2013-08-19 07:32:30 -0400
committerTakashi Iwai <tiwai@suse.de>2013-08-19 09:46:17 -0400
commitc841ad2a9b86c7317dc7e4fe4e03bc56a6c0d6e8 (patch)
treecdca7dc619ea3eb5347d4288c4f3a5638e1806ce
parentcd5302c0d4b79bef7660bb4be300d169e38f39c3 (diff)
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>
-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 7f9e4062a8d7..c6c98298ac39 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)
3855 3855
3856 /* Request power well for Haswell HDA controller and codec */ 3856 /* Request power well for Haswell HDA controller and codec */
3857 if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) { 3857 if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) {
3858#ifdef CONFIG_SND_HDA_I915
3858 err = hda_i915_init(); 3859 err = hda_i915_init();
3859 if (err < 0) { 3860 if (err < 0) {
3860 snd_printk(KERN_ERR SFX "Error request power-well from i915\n"); 3861 snd_printk(KERN_ERR SFX "Error request power-well from i915\n");
3861 goto out_free; 3862 goto out_free;
3862 } 3863 }
3864#endif
3863 hda_display_power(true); 3865 hda_display_power(true);
3864 } 3866 }
3865 3867