diff options
author | 2014-08-04 11:11:22 +0200 | |
---|---|---|
committer | 2014-08-04 11:11:22 +0200 | |
commit | 2e65b8916cce4436df29812610d2c2fecdb42b5a (patch) | |
tree | fdcae670bd651c8e772eb7cd60420eba5d26a0db /sound/pci/hda/patch_cirrus.c | |
parent | ALSA: hda - fix an external mic jack problem on a HP machine (diff) | |
parent | ALSA: hda - add mic mute led hook for dell machines (diff) | |
download | linux-dev-2e65b8916cce4436df29812610d2c2fecdb42b5a.tar.xz linux-dev-2e65b8916cce4436df29812610d2c2fecdb42b5a.zip |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'sound/pci/hda/patch_cirrus.c')
-rw-r--r-- | sound/pci/hda/patch_cirrus.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c index 387f0b551889..3db724eaa53c 100644 --- a/sound/pci/hda/patch_cirrus.c +++ b/sound/pci/hda/patch_cirrus.c @@ -657,8 +657,10 @@ static void cs4208_fixup_mac(struct hda_codec *codec, { if (action != HDA_FIXUP_ACT_PRE_PROBE) return; + + codec->fixup_id = HDA_FIXUP_ID_NOT_SET; snd_hda_pick_fixup(codec, NULL, cs4208_mac_fixup_tbl, cs4208_fixups); - if (codec->fixup_id < 0 || codec->fixup_id == CS4208_MAC_AUTO) + if (codec->fixup_id == HDA_FIXUP_ID_NOT_SET) codec->fixup_id = CS4208_GPIO0; /* default fixup */ snd_hda_apply_fixup(codec, action); } |