diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-12-15 09:33:51 (GMT) |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-12-15 09:33:51 (GMT) |
commit | a9e060571a057c132240753b7f815f4a1e0320a3 (patch) | |
tree | bdb1f47d665e8a98c6a881e6373001c9eae5865f /sound/pci/hda/patch_analog.c | |
parent | 6e0446cb4b6e2469a0db58fbe6dffcd63d3d4066 (diff) | |
parent | 6dd7dc767e35cfbb38f8c63a50b1c27acad25920 (diff) | |
download | linux-fsl-qoriq-a9e060571a057c132240753b7f815f4a1e0320a3.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 447eda1..1a36137 100644 --- a/sound/pci/hda/patch_analog.c +++ b/sound/pci/hda/patch_analog.c @@ -1789,6 +1789,14 @@ static int patch_ad1981(struct hda_codec *codec) codec->patch_ops.init = ad1981_hp_init; codec->patch_ops.unsol_event = ad1981_hp_unsol_event; + /* 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_THINKPAD: spec->mixers[0] = ad1981_thinkpad_mixers; |