diff options
author | Takashi Iwai <tiwai@suse.de> | 2024-10-02 21:29:16 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2024-10-02 21:29:16 +0200 |
commit | 0c436dfe5c25d0931b164b944165259f95e5281f (patch) | |
tree | 7b1d3d8d7bc600f218af0ca6ed9a4f7527f88e5f /sound/pci | |
parent | Revert "ALSA: hda: Conditionally use snooping for AMD HDMI" (diff) | |
parent | qrb4210-rb2: add HDMI audio playback support (diff) | |
download | linux-0c436dfe5c25d0931b164b944165259f95e5281f.tar.xz linux-0c436dfe5c25d0931b164b944165259f95e5281f.zip |
Merge tag 'asoc-fix-v6.12-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v6.12
A bunch of fixes here that came in during the merge window and the first
week of release, plus some new quirks and device IDs. There's nothing
major here, it's a bit bigger than it might've been due to there being
no fixes sent during the merge window due to your vacation.
Diffstat (limited to 'sound/pci')
-rw-r--r-- | sound/pci/hda/hda_intel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index bf9c9bfd38e3..b4540c5cd2a6 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -2680,7 +2680,7 @@ static const struct pci_device_id azx_ids[] = { .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS | AZX_DCAPS_PM_RUNTIME }, /* GLENFLY */ - { PCI_DEVICE(0x6766, PCI_ANY_ID), + { PCI_DEVICE(PCI_VENDOR_ID_GLENFLY, PCI_ANY_ID), .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8, .class_mask = 0xffffff, .driver_data = AZX_DRIVER_GFHDMI | AZX_DCAPS_POSFIX_LPIB | |