From: Hui Wang Date: Mon, 26 May 2014 08:22:43 +0000 (+0800) Subject: ALSA: hda - drop def association and sequence from pinconf comparing X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=c687200b9d4ef60042a50f7d942cfef120cc7bf1;p=openwrt%2Fstaging%2Fblogic.git 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 Signed-off-by: Takashi Iwai --- 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;