diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-04-07 09:54:46 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-04-07 09:54:46 +0200 |
| commit | 55b371d4ac5ed6f3338a398fbf9f2eb9ace78799 (patch) | |
| tree | ee2da61917db08ebc4219c1cc762766114fb3a28 /sound/pci/hda/patch_analog.c | |
| parent | 7445c995b06f2a999541ccf127886d24a2a7d012 (diff) | |
| parent | f9700d5a4575e7fb343df10a1d29d425e4b81082 (diff) | |
| download | linux-55b371d4ac5ed6f3338a398fbf9f2eb9ace78799.tar.gz linux-55b371d4ac5ed6f3338a398fbf9f2eb9ace78799.tar.xz | |
Merge branch 'fix/hda' into for-linus
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; |