diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-04-16 15:20:06 +0200 | 
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-04-16 15:20:06 +0200 | 
| commit | cf0dbba515415bb19b11f9323d5f7bebd7f24fd6 (patch) | |
| tree | 375bbc1ade1a92acd6493d224dd701fd7f209014 /sound/pci/hda/patch_analog.c | |
| parent | 1cff399ecd9125d8e6a634a1957be1aeb3195a12 (diff) | |
| parent | 0340c7dccd80d8706c636e030a6ebbddbddca690 (diff) | |
Merge remote branch 'alsa/devel' into topic/misc
Diffstat (limited to 'sound/pci/hda/patch_analog.c')
| -rw-r--r-- | sound/pci/hda/patch_analog.c | 8 | 
1 files changed, 8 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c index e6d1bdff1b6e..af34606c30c3 100644 --- a/sound/pci/hda/patch_analog.c +++ b/sound/pci/hda/patch_analog.c @@ -1896,6 +1896,14 @@ static int patch_ad1981(struct hda_codec *codec)  	case AD1981_THINKPAD:  		spec->mixers[0] = ad1981_thinkpad_mixers;  		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;  	case AD1981_TOSHIBA:  		spec->mixers[0] = ad1981_hp_mixers;  | 
