diff options
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/hda/hda_intel.c | 9 | 
1 files changed, 5 insertions, 4 deletions
| diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 457a2c065485..0310193ea1bd 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -2078,9 +2078,10 @@ static void pcm_mmap_prepare(struct snd_pcm_substream *substream,   * some HD-audio PCI entries are exposed without any codecs, and such devices   * should be ignored from the beginning.   */ -static const struct snd_pci_quirk driver_blacklist[] = { -	SND_PCI_QUIRK(0x1462, 0xcb59, "MSI TRX40 Creator", 0), -	SND_PCI_QUIRK(0x1462, 0xcb60, "MSI TRX40", 0), +static const struct pci_device_id driver_blacklist[] = { +	{ PCI_DEVICE_SUB(0x1022, 0x1487, 0x1043, 0x874f) }, /* ASUS ROG Zenith II / Strix */ +	{ PCI_DEVICE_SUB(0x1022, 0x1487, 0x1462, 0xcb59) }, /* MSI TRX40 Creator */ +	{ PCI_DEVICE_SUB(0x1022, 0x1487, 0x1462, 0xcb60) }, /* MSI TRX40 */  	{}  }; @@ -2100,7 +2101,7 @@ static int azx_probe(struct pci_dev *pci,  	bool schedule_probe;  	int err; -	if (snd_pci_quirk_lookup(pci, driver_blacklist)) { +	if (pci_match_id(driver_blacklist, pci)) {  		dev_info(&pci->dev, "Skipping the blacklisted device\n");  		return -ENODEV;  	} |