Merge branch 'topic/hda' into for-next
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 5aa5cfa..87df90d 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -1907,8 +1907,6 @@
if (pci->device != 0x0f04 && pci->device != 0x2284)
hda->need_i915_power = 1;
-
-#ifdef CONFIG_SND_HDA_I915
err = hda_i915_init(hda);
if (err < 0)
goto i915_power_fail;
@@ -1919,7 +1917,6 @@
"Cannot turn on display power on i915\n");
goto i915_power_fail;
}
-#endif
}
err = azx_first_init(chip);
diff --git a/sound/pci/hda/hda_intel.h b/sound/pci/hda/hda_intel.h
index 505f987..ff41fc30 100644
--- a/sound/pci/hda/hda_intel.h
+++ b/sound/pci/hda/hda_intel.h
@@ -63,7 +63,7 @@
static inline void haswell_set_bclk(struct hda_intel *hda) { return; }
static inline int hda_i915_init(struct hda_intel *hda)
{
- return -ENODEV;
+ return 0;
}
static inline int hda_i915_exit(struct hda_intel *hda)
{