Commit 6ee8eeb4 authored Dec 09, 2015 by Takashi Iwai

ALSA: hda - Less grumbling about lack of i915 binding



The recent commit [6603249d: ALSA: hda - Enable audio component
for old Intel PCH devices] enabled the i915 binding for HDMI/DP on old
Intel PCHs.  But many boards are without HDMI/DP, and they actually
don't need i915 binding, and yet the driver has a check of i915
binding and complains like
	Haswell must be built with CONFIG_SND_HDA_I915
This error is false-positive, and it should be put only for HSW/BDW,
instead of all devices that may be bound with i915.

This patch fixes the condition to check, as well as rephrasing the
message specific to HSW/BDW HDMI/DP.

Fixes: 6603249d ('ALSA: hda - Enable audio component for old Intel PCH devices')
Signed-off-by: Takashi Iwai <tiwai@suse.de>

parent e7fdd527

sound/pci/hda/hda_intel.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1954,8 +1954,8 @@ static int azx_probe(struct pci_dev *pci,
		#endif /* CONFIG_SND_HDA_PATCH_LOADER */

		#ifndef CONFIG_SND_HDA_I915
		if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL)
		dev_err(card->dev, "Haswell must build in CONFIG_SND_HDA_I915\n");
		if (CONTROLLER_IN_GPU(pci))
		dev_err(card->dev, "Haswell/Broadwell HDMI/DP must build in CONFIG_SND_HDA_I915\n");
		#endif

		if (schedule_probe)