summaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorHui Wang2014-05-26 10:22:42 +0200
committerTakashi Iwai2014-05-26 11:05:26 +0200
commit621b5a047e5c9ced76afd5e8092283032cda802b (patch)
tree95e7c856d7f7f29231cdb95f80280b337c5a3d65 /sound/pci
parentALSA: hda - Add a new quirk match based on default pin configuration (diff)
downloadkernel-qcow2-linux-621b5a047e5c9ced76afd5e8092283032cda802b.tar.gz
kernel-qcow2-linux-621b5a047e5c9ced76afd5e8092283032cda802b.tar.xz
kernel-qcow2-linux-621b5a047e5c9ced76afd5e8092283032cda802b.zip
ALSA: hda - get subvendor from codec rather than pci_dev
It is safer for non-pci situation. Signed-off-by: Hui Wang <hui.wang@canonical.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/hda/hda_auto_parser.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_auto_parser.c b/sound/pci/hda/hda_auto_parser.c
index a14275326234..b684c6e4f301 100644
--- a/sound/pci/hda/hda_auto_parser.c
+++ b/sound/pci/hda/hda_auto_parser.c
@@ -860,7 +860,7 @@ void snd_hda_pick_pin_fixup(struct hda_codec *codec,
return;
for (pq = pin_quirk; pq->subvendor; pq++) {
- if (codec->bus->pci->subsystem_vendor != pq->subvendor)
+ if ((codec->subsystem_id & 0xffff0000) != (pq->subvendor << 16))
continue;
if (codec->vendor_id != pq->codec)
continue;