diff options
| author | Takashi Iwai | 2015-04-30 08:27:18 +0200 |
|---|---|---|
| committer | Takashi Iwai | 2015-04-30 08:27:18 +0200 |
| commit | 71f881ce5783482635d9534225cedd06b4fe21cb (patch) | |
| tree | 477279a19f32c30e6902a633f7c7106593f75d80 /sound/pci | |
| parent | 85abf3ec5fa663c9638ef2d10d9623880a26458e (diff) | |
| parent | 31c648e0d304bbfc49a4a22c6139718367f3fd8d (diff) | |
Merge branch 'topic/hda' into for-next
Diffstat (limited to 'sound/pci')
| -rw-r--r-- | sound/pci/hda/hda_intel.c | 3 | ||||
| -rw-r--r-- | sound/pci/hda/hda_intel.h | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 5aa5cfa517aa..87df90d245bc 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -1907,8 +1907,6 @@ static int azx_probe_continue(struct azx *chip) 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 @@ static int azx_probe_continue(struct azx *chip) "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 505f987eb4a2..ff41fc30091d 100644 --- a/sound/pci/hda/hda_intel.h +++ b/sound/pci/hda/hda_intel.h @@ -63,7 +63,7 @@ static inline int hda_display_power(struct hda_intel *hda, bool enable) 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) { |