From: Takashi Iwai Date: Mon, 4 Jun 2007 16:32:23 +0000 (+0200) Subject: [ALSA] hda-codec - Fix Oops with AD1984 thinkpad model X-Git-Tag: v2.6.23-rc1~215^2~79 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b194401a31b8df9a07a1850e3fe44fc7ba832a4;p=linux-2.6 [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: Takashi Iwai Signed-off-by: Jaroslav Kysela --- diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c index 4659fdeec3..c121647059 100644 --- a/sound/pci/hda/patch_analog.c +++ b/sound/pci/hda/patch_analog.c @@ -2883,8 +2883,8 @@ static struct snd_kcontrol_new ad1984_dmic_mixers[] = { */ static struct hda_verb ad1884_init_verbs[] = { /* DACs; mute as default */ - {0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, - {0x04, 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_ZERO}, /* 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(1)}, @@ -2960,7 +2960,7 @@ static int patch_ad1884(struct hda_codec *codec) * Lenovo Thinkpad T61/X61 */ static struct hda_input_mux ad1984_thinkpad_capture_source = { - .num_items = 4, + .num_items = 3, .items = { { "Mic", 0x0 }, { "Internal Mic", 0x1 },