ALSA: hda: Match both PCI ID and SSID for driver blacklist
commit977dfef40c
upstream. The commit3c6fd1f07e
("ALSA: hda: Add driver blacklist") added a new blacklist for the devices that are known to have empty codecs, and one of the entries was ASUS ROG Zenith II (PCI SSID 1043:874f). However, it turned out that the very same PCI SSID is used for the previous model that does have the valid HD-audio codecs and the change broke the sound on it. Since the empty codec problem appear on the certain AMD platform (PCI ID 1022:1487), this patch changes the blacklist matching to both PCI ID and SSID using pci_match_id(). Also, the entry that was removed by the previous fix for ASUS ROG Zenigh II is re-added. Link: https://lore.kernel.org/r/20200424061222.19792-1-tiwai@suse.de Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
b8b42c8dcf
commit
85701f4768
|
@ -2023,9 +2023,10 @@ static void pcm_mmap_prepare(struct snd_pcm_substream *substream,
|
||||||
* some HD-audio PCI entries are exposed without any codecs, and such devices
|
* some HD-audio PCI entries are exposed without any codecs, and such devices
|
||||||
* should be ignored from the beginning.
|
* should be ignored from the beginning.
|
||||||
*/
|
*/
|
||||||
static const struct snd_pci_quirk driver_blacklist[] = {
|
static const struct pci_device_id driver_blacklist[] = {
|
||||||
SND_PCI_QUIRK(0x1462, 0xcb59, "MSI TRX40 Creator", 0),
|
{ PCI_DEVICE_SUB(0x1022, 0x1487, 0x1043, 0x874f) }, /* ASUS ROG Zenith II / Strix */
|
||||||
SND_PCI_QUIRK(0x1462, 0xcb60, "MSI TRX40", 0),
|
{ PCI_DEVICE_SUB(0x1022, 0x1487, 0x1462, 0xcb59) }, /* MSI TRX40 Creator */
|
||||||
|
{ PCI_DEVICE_SUB(0x1022, 0x1487, 0x1462, 0xcb60) }, /* MSI TRX40 */
|
||||||
{}
|
{}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -2064,7 +2065,7 @@ static int azx_probe(struct pci_dev *pci,
|
||||||
bool schedule_probe;
|
bool schedule_probe;
|
||||||
int err;
|
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");
|
dev_info(&pci->dev, "Skipping the blacklisted device\n");
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue