Commit ff447886 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Takashi Iwai

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

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: 535115b5 ("ALSA: hda - Abort the probe without i915 binding for HSW/B")
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Link: https://lore.kernel.org/r/20230307214054.886721-1-helgaas@kernel.orgSigned-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent a86e79e3
...@@ -328,14 +328,15 @@ enum { ...@@ -328,14 +328,15 @@ enum {
#define needs_eld_notify_link(chip) false #define needs_eld_notify_link(chip) false
#endif #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 == 0x0c0c) || \
((pci)->device == 0x0d0c) || \ ((pci)->device == 0x0d0c) || \
((pci)->device == 0x160c) || \ ((pci)->device == 0x160c) || \
((pci)->device == 0x490d) || \ ((pci)->device == 0x490d) || \
((pci)->device == 0x4f90) || \ ((pci)->device == 0x4f90) || \
((pci)->device == 0x4f91) || \ ((pci)->device == 0x4f91) || \
((pci)->device == 0x4f92)) ((pci)->device == 0x4f92)))
#define IS_BXT(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x5a98) #define IS_BXT(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x5a98)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment