diff options
| author | Hui Wang <hui.wang@canonical.com> | 2014-05-29 07:59:17 (GMT) |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-05-29 13:59:28 (GMT) |
| commit | 37df09492c3315c4824e53ebcea781c114be9f41 (patch) | |
| tree | b98ee8b1c4cec6ee1d25168b7bbe94a83e5041b3 /sound/pci | |
| parent | 396178370b9dc20275811dcc3b607c5af70689ba (diff) | |
| download | linux-37df09492c3315c4824e53ebcea781c114be9f41.tar.xz | |
Revert "ALSA: hda - drop def association and sequence from pinconf comparing"
This reverts commit c687200b9d4ef60042a50f7d942cfef120cc7bf1.
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>
Diffstat (limited to 'sound/pci')
| -rw-r--r-- | sound/pci/hda/hda_auto_parser.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/pci/hda/hda_auto_parser.c b/sound/pci/hda/hda_auto_parser.c index 3cf9137..b684c6e 100644 --- a/sound/pci/hda/hda_auto_parser.c +++ b/sound/pci/hda/hda_auto_parser.c @@ -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; |