diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-07-26 10:28:22 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-07-26 10:28:22 +0200 |
commit | d4b78aceb8e26883a2fc35ac56e62b61da06ace9 (patch) | |
tree | 5493c993466597e12a1317980cac39d3f5b6f069 /sound | |
parent | f301a67ac76cf3fabfa08ec91fb2f03f09cae5d5 (diff) | |
parent | 2385b789f1525542396d8f6b0cc37c1eb2493b4c (diff) |
Merge branch 'topic/hda' into for-next
Diffstat (limited to 'sound')
-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 a1fc83753cc6..bf3ced51e0f8 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; } |