aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-04-01 10:04:13 -0400
committerTakashi Iwai <tiwai@suse.de>2010-04-01 10:04:13 -0400
commit7a2e38a555f2b1a20aaaf30f3d8ecad8faa97ea7 (patch)
treec1200e80306c785e5d6713f11470eed8f7ca4d75 /sound/pci
parentc35c9d5d3f03c203168e816f6f735d23f92fd6f1 (diff)
parentb8e80cf386419453678b01bef830f53445ebb15d (diff)
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/hda/patch_analog.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c
index 262f5b5decf..9cbd80cba12 100644
--- a/sound/pci/hda/patch_analog.c
+++ b/sound/pci/hda/patch_analog.c
@@ -1904,6 +1904,14 @@ static int patch_ad1981(struct hda_codec *codec)
1904 case AD1981_THINKPAD: 1904 case AD1981_THINKPAD:
1905 spec->mixers[0] = ad1981_thinkpad_mixers; 1905 spec->mixers[0] = ad1981_thinkpad_mixers;
1906 spec->input_mux = &ad1981_thinkpad_capture_source; 1906 spec->input_mux = &ad1981_thinkpad_capture_source;
1907 /* set the upper-limit for mixer amp to 0dB for avoiding the
1908 * possible damage by overloading
1909 */
1910 snd_hda_override_amp_caps(codec, 0x11, HDA_INPUT,
1911 (0x17 << AC_AMPCAP_OFFSET_SHIFT) |
1912 (0x17 << AC_AMPCAP_NUM_STEPS_SHIFT) |
1913 (0x05 << AC_AMPCAP_STEP_SIZE_SHIFT) |
1914 (1 << AC_AMPCAP_MUTE_SHIFT));
1907 break; 1915 break;
1908 case AD1981_TOSHIBA: 1916 case AD1981_TOSHIBA:
1909 spec->mixers[0] = ad1981_hp_mixers; 1917 spec->mixers[0] = ad1981_hp_mixers;