Merge branch 'fix/hda' into topic/hda

This commit is contained in:
Takashi Iwai 2010-04-01 16:04:13 +02:00
commit 7a2e38a555

View File

@ -1904,6 +1904,14 @@ static int patch_ad1981(struct hda_codec *codec)
case AD1981_THINKPAD: case AD1981_THINKPAD:
spec->mixers[0] = ad1981_thinkpad_mixers; spec->mixers[0] = ad1981_thinkpad_mixers;
spec->input_mux = &ad1981_thinkpad_capture_source; spec->input_mux = &ad1981_thinkpad_capture_source;
/* set the upper-limit for mixer amp to 0dB for avoiding the
* possible damage by overloading
*/
snd_hda_override_amp_caps(codec, 0x11, HDA_INPUT,
(0x17 << AC_AMPCAP_OFFSET_SHIFT) |
(0x17 << AC_AMPCAP_NUM_STEPS_SHIFT) |
(0x05 << AC_AMPCAP_STEP_SIZE_SHIFT) |
(1 << AC_AMPCAP_MUTE_SHIFT));
break; break;
case AD1981_TOSHIBA: case AD1981_TOSHIBA:
spec->mixers[0] = ad1981_hp_mixers; spec->mixers[0] = ad1981_hp_mixers;