diff mbox series

ALSA: hda: Match only Intel devices with CONTROLLER_IN_GPU()

Message ID 20230307214054.886721-1-helgaas@kernel.org (mailing list archive)
State New, archived
Headers show
Series ALSA: hda: Match only Intel devices with CONTROLLER_IN_GPU() | expand

Commit Message

Bjorn Helgaas March 7, 2023, 9:40 p.m. UTC 
From: Bjorn Helgaas <bhelgaas@google.com>

CONTROLLER_IN_GPU() is clearly intended to match only Intel devices, but
previously it checked only the PCI Device ID, not the Vendor ID, so it
could match devices from other vendors that happened to use the same Device
ID.

Update CONTROLLER_IN_GPU() so it matches only Intel devices.

Fixes: 535115b5ff51 ("ALSA: hda - Abort the probe without i915 binding for HSW/B")
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
 sound/pci/hda/hda_intel.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Takashi Iwai March 8, 2023, 5:40 a.m. UTC | #1 
On Tue, 07 Mar 2023 22:40:54 +0100,
Bjorn Helgaas wrote:
> 
> From: Bjorn Helgaas <bhelgaas@google.com>
> 
> CONTROLLER_IN_GPU() is clearly intended to match only Intel devices, but
> previously it checked only the PCI Device ID, not the Vendor ID, so it
> could match devices from other vendors that happened to use the same Device
> ID.
> 
> Update CONTROLLER_IN_GPU() so it matches only Intel devices.
> 
> Fixes: 535115b5ff51 ("ALSA: hda - Abort the probe without i915 binding for HSW/B")
> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

Thanks, applied now.


Takashi
diff mbox series

Patch

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 81c4a45254ff..77a592f21947 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -328,14 +328,15 @@  enum {
 #define needs_eld_notify_link(chip)	false
 #endif
 
-#define CONTROLLER_IN_GPU(pci) (((pci)->device == 0x0a0c) || \
+#define CONTROLLER_IN_GPU(pci) (((pci)->vendor == 0x8086) &&         \
+				       (((pci)->device == 0x0a0c) || \
 					((pci)->device == 0x0c0c) || \
 					((pci)->device == 0x0d0c) || \
 					((pci)->device == 0x160c) || \
 					((pci)->device == 0x490d) || \
 					((pci)->device == 0x4f90) || \
 					((pci)->device == 0x4f91) || \
-					((pci)->device == 0x4f92))
+					((pci)->device == 0x4f92)))
 
 #define IS_BXT(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x5a98)