diff options
author | Hui Wang <hui.wang@canonical.com> | 2014-05-26 16:22:43 +0800 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-05-26 11:05:55 +0200 |
commit | c687200b9d4ef60042a50f7d942cfef120cc7bf1 (patch) | |
tree | a2750a8deb7d5a4f9a26782e8b8fa9c19830a27d /sound/pci | |
parent | 621b5a047e5c9ced76afd5e8092283032cda802b (diff) |
ALSA: hda - drop def association and sequence from pinconf comparing
A lot a machine have the same codec, but they have different default
pinconf setting just because the def association and sequence is
different, as a result they can't share a hda_pintbl[], to overcome
it, we don't compare def association and sequence in the pinconf
matching.
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, 2 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_auto_parser.c b/sound/pci/hda/hda_auto_parser.c index b684c6e4f301..3cf913772e9b 100644 --- a/sound/pci/hda/hda_auto_parser.c +++ b/sound/pci/hda/hda_auto_parser.c @@ -844,7 +844,8 @@ static bool pin_config_match(struct hda_codec *codec, { for (; pins->nid; pins++) { u32 def_conf = snd_hda_codec_get_pincfg(codec, pins->nid); - if (pins->val != def_conf) + u32 mask = 0xffffff00; + if ((pins->val & mask) != (def_conf & mask)) return false; } return true; |