Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
sound
/
pci
/
hda
/
hda_auto_parser.c
diff --git
a/kernel/sound/pci/hda/hda_auto_parser.c
b/kernel/sound/pci/hda/hda_auto_parser.c
index
7f57a14
..
a03cf68
100644
(file)
--- a/
kernel/sound/pci/hda/hda_auto_parser.c
+++ b/
kernel/sound/pci/hda/hda_auto_parser.c
@@
-884,6
+884,8
@@
void snd_hda_apply_fixup(struct hda_codec *codec, int action)
}
EXPORT_SYMBOL_GPL(snd_hda_apply_fixup);
}
EXPORT_SYMBOL_GPL(snd_hda_apply_fixup);
+#define IGNORE_SEQ_ASSOC (~(AC_DEFCFG_SEQUENCE | AC_DEFCFG_DEF_ASSOC))
+
static bool pin_config_match(struct hda_codec *codec,
const struct hda_pintbl *pins)
{
static bool pin_config_match(struct hda_codec *codec,
const struct hda_pintbl *pins)
{
@@
-901,7
+903,7
@@
static bool pin_config_match(struct hda_codec *codec,
for (; t_pins->nid; t_pins++) {
if (t_pins->nid == nid) {
found = 1;
for (; t_pins->nid; t_pins++) {
if (t_pins->nid == nid) {
found = 1;
- if (
t_pins->val == cfg
)
+ if (
(t_pins->val & IGNORE_SEQ_ASSOC) == (cfg & IGNORE_SEQ_ASSOC)
)
break;
else if ((cfg & 0xf0000000) == 0x40000000 && (t_pins->val & 0xf0000000) == 0x40000000)
break;
break;
else if ((cfg & 0xf0000000) == 0x40000000 && (t_pins->val & 0xf0000000) == 0x40000000)
break;