Skip to content

Commit ff44788

Browse files
bjorn-helgaastiwai
authored andcommitted
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: 535115b ("ALSA: hda - Abort the probe without i915 binding for HSW/B") Signed-off-by: Bjorn Helgaas <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Takashi Iwai <[email protected]>
1 parent a86e79e commit ff44788

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

sound/pci/hda/hda_intel.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -328,14 +328,15 @@ enum {
328328
#define needs_eld_notify_link(chip) false
329329
#endif
330330

331-
#define CONTROLLER_IN_GPU(pci) (((pci)->device == 0x0a0c) || \
331+
#define CONTROLLER_IN_GPU(pci) (((pci)->vendor == 0x8086) && \
332+
(((pci)->device == 0x0a0c) || \
332333
((pci)->device == 0x0c0c) || \
333334
((pci)->device == 0x0d0c) || \
334335
((pci)->device == 0x160c) || \
335336
((pci)->device == 0x490d) || \
336337
((pci)->device == 0x4f90) || \
337338
((pci)->device == 0x4f91) || \
338-
((pci)->device == 0x4f92))
339+
((pci)->device == 0x4f92)))
339340

340341
#define IS_BXT(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x5a98)
341342

0 commit comments

Comments
 (0)