Commit 3b194401 authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela

[ALSA] hda-codec - Fix Oops with AD1984 thinkpad model

Fixed Oops with AD1984 thinkpad model.  Also fixed the wrong
init verbs for NID 0x03 and 0x04, which have apparently no mute
bit.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent 304e3bb7
...@@ -2883,8 +2883,8 @@ static struct snd_kcontrol_new ad1984_dmic_mixers[] = { ...@@ -2883,8 +2883,8 @@ static struct snd_kcontrol_new ad1984_dmic_mixers[] = {
*/ */
static struct hda_verb ad1884_init_verbs[] = { static struct hda_verb ad1884_init_verbs[] = {
/* DACs; mute as default */ /* DACs; mute as default */
{0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, {0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
{0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, {0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
/* Port-A (HP) mixer */ /* Port-A (HP) mixer */
{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)}, {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
...@@ -2960,7 +2960,7 @@ static int patch_ad1884(struct hda_codec *codec) ...@@ -2960,7 +2960,7 @@ static int patch_ad1884(struct hda_codec *codec)
* Lenovo Thinkpad T61/X61 * Lenovo Thinkpad T61/X61
*/ */
static struct hda_input_mux ad1984_thinkpad_capture_source = { static struct hda_input_mux ad1984_thinkpad_capture_source = {
.num_items = 4, .num_items = 3,
.items = { .items = {
{ "Mic", 0x0 }, { "Mic", 0x0 },
{ "Internal Mic", 0x1 }, { "Internal Mic", 0x1 },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment