]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
ALSA: hda - Ensure codec patch files are checked for the correct codec ID
authorDavid Henningsson <diwic@ubuntu.com>
Wed, 2 Jun 2010 14:56:41 +0000 (16:56 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 26 Jul 2010 08:28:01 +0000 (10:28 +0200)
Signed-off-by: David Henningsson <diwic@ubuntu.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/hda/hda_hwdep.c

index a1fc83753cc6951365ac6121cc8fbce0b5287bb2..bf3ced51e0f8440ba11b6910311dfcd269d416bc 100644 (file)
@@ -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;
                        }