]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Revert "ALSA: hda - drop def association and sequence from pinconf comparing"
authorHui Wang <hui.wang@canonical.com>
Thu, 29 May 2014 07:59:17 +0000 (15:59 +0800)
committerTakashi Iwai <tiwai@suse.de>
Thu, 29 May 2014 13:59:28 +0000 (15:59 +0200)
This reverts commit 4d0c6d925f3dd7c6aac9f486c9a6ad1f722477b2.

Dropping the def association and sequence from pinconf comparing is a
bit risky, It will introduce a greater risk of catching unwanted
machines.

And in addition, so far no BIOS experts give us an explicit answer
whether it makes senses to compare these two fields or not.

For safety reason, we revert this commit.

Signed-off-by: Hui Wang <hui.wang@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/hda/hda_auto_parser.c

index 3cf913772e9ba75c2691aa4ff37e4cf6422325cd..b684c6e4f301253b39b1e2ed4a82ca4e059cce21 100644 (file)
@@ -844,8 +844,7 @@ static bool pin_config_match(struct hda_codec *codec,
 {
        for (; pins->nid; pins++) {
                u32 def_conf = snd_hda_codec_get_pincfg(codec, pins->nid);
-               u32 mask = 0xffffff00;
-               if ((pins->val & mask) != (def_conf & mask))
+               if (pins->val != def_conf)
                        return false;
        }
        return true;