diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-08-05 11:16:56 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-08-05 11:16:56 +0200 |
commit | 2603798070a80d76e7e6d2992ba4ec74addcec90 (patch) | |
tree | 7a1cdc33bd9bbf3807db239205de02d6beb58e30 /sound/pci/hda/hda_hwdep.c | |
parent | 9fe6206f400646a2322096b56c59891d530e8d51 (diff) | |
parent | fc091769a5aa65c045bfbda149c424ba33d0abbb (diff) |
Merge branch 'topic/hda' into for-linus
Diffstat (limited to 'sound/pci/hda/hda_hwdep.c')
-rw-r--r-- | sound/pci/hda/hda_hwdep.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_hwdep.c b/sound/pci/hda/hda_hwdep.c index a1fc83753cc..bf3ced51e0f 100644 --- a/sound/pci/hda/hda_hwdep.c +++ b/sound/pci/hda/hda_hwdep.c @@ -649,7 +649,9 @@ static void parse_codec_mode(char *buf, struct hda_bus *bus, *codecp = NULL; if (sscanf(buf, "%i %i %i", &vendorid, &subid, &caddr) == 3) { list_for_each_entry(codec, &bus->codec_list, list) { - if (codec->addr == caddr) { + if (codec->vendor_id == vendorid && + codec->subsystem_id == subid && + codec->addr == caddr) { *codecp = codec; break; } |