aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2007-06-04 12:32:23 -0400
committerJaroslav Kysela <perex@suse.cz>2007-07-20 05:11:23 -0400
commit3b194401a31b8df9a07a1850e3fe44fc7ba832a4 (patch)
tree2d923d7cf13ddaaf08f82aba2ada85df735de55d /sound/pci
parent304e3bb7a15d839cef64b24a1bcc1230b2ae6fa6 (diff)
[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 <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/hda/patch_analog.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c
index 4659fdeec3dc..c1216470595d 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[] = {
2883 */ 2883 */
2884static struct hda_verb ad1884_init_verbs[] = { 2884static struct hda_verb ad1884_init_verbs[] = {
2885 /* DACs; mute as default */ 2885 /* DACs; mute as default */
2886 {0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, 2886 {0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
2887 {0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, 2887 {0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
2888 /* Port-A (HP) mixer */ 2888 /* Port-A (HP) mixer */
2889 {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, 2889 {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
2890 {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)}, 2890 {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
@@ -2960,7 +2960,7 @@ static int patch_ad1884(struct hda_codec *codec)
2960 * Lenovo Thinkpad T61/X61 2960 * Lenovo Thinkpad T61/X61
2961 */ 2961 */
2962static struct hda_input_mux ad1984_thinkpad_capture_source = { 2962static struct hda_input_mux ad1984_thinkpad_capture_source = {
2963 .num_items = 4, 2963 .num_items = 3,
2964 .items = { 2964 .items = {
2965 { "Mic", 0x0 }, 2965 { "Mic", 0x0 },
2966 { "Internal Mic", 0x1 }, 2966 { "Internal Mic", 0x1 },