Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71f881ce authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/hda' into for-next

parents 85abf3ec 31c648e0

sound/pci/hda/hda_intel.c

+0 −3
Original line number Diff line number Diff line
@@ -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);

sound/pci/hda/hda_intel.h

+1 −1
Original line number Diff line number Diff line
@@ -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)

{