redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

Merge branch 'topic/hda' into for-next

Browse source
This commit is contained in:
Takashi Iwai 2015-04-30 08:27:18 +02:00
parent 85abf3ec5f 31c648e0d3
commit 71f881ce57
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sound/pci/hda/hda_intel.c
View file

@ -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);

2
sound/pci/hda/hda_intel.h
View file

@ -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)
{