Skip to content

K
kernel_linux

OpenHarmony / kernel_linux
上一次同步 4 年多

通知 15
Star 8
Fork 2
K
kernel_linux
提交 71f881ce 编写于 作者: T Takashi Iwai
浏览文件
操作

Merge branch 'topic/hda' into for-next

上级 85abf3ec 31c648e0
隐藏空白更改
内联 并排
Showing with 1 addition and 4 deletion
sound/pci/hda/hda_intel.c
浏览文件 @ 71f881ce
...@@ -1907,8 +1907,6 @@ static int azx_probe_continue(struct azx *chip) ...@@ -1907,8 +1907,6 @@ static int azx_probe_continue(struct azx *chip)
if (pci->device != 0x0f04 && pci->device != 0x2284) if (pci->device != 0x0f04 && pci->device != 0x2284)
hda->need_i915_power = 1; hda->need_i915_power = 1;
#ifdef CONFIG_SND_HDA_I915
err = hda_i915_init(hda); err = hda_i915_init(hda);
if (err < 0) if (err < 0)
goto i915_power_fail; goto i915_power_fail;
...@@ -1919,7 +1917,6 @@ static int azx_probe_continue(struct azx *chip) ...@@ -1919,7 +1917,6 @@ static int azx_probe_continue(struct azx *chip)
"Cannot turn on display power on i915\n"); "Cannot turn on display power on i915\n");
goto i915_power_fail; goto i915_power_fail;
} }
#endif
} }
err = azx_first_init(chip); err = azx_first_init(chip);
......
sound/pci/hda/hda_intel.h
浏览文件 @ 71f881ce
...@@ -63,7 +63,7 @@ static inline int hda_display_power(struct hda_intel *hda, bool enable) ...@@ -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 void haswell_set_bclk(struct hda_intel *hda) { return; }
static inline int hda_i915_init(struct hda_intel *hda) static inline int hda_i915_init(struct hda_intel *hda)
{ {
return -ENODEV; return 0;
} }
static inline int hda_i915_exit(struct hda_intel *hda) static inline int hda_i915_exit(struct hda_intel *hda)
{ {
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或