diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-04-19 05:39:46 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-04-19 05:39:46 -0400 |
| commit | 7c4112a285b00e137db04844b8b9b478e5d4363e (patch) | |
| tree | 6e708230baf2213b902a1e8f04a21c9bf64487a3 /sound/pci/hda/patch_analog.c | |
| parent | 1e2ae4ddd373af6fa3ea2483d7fc4a08c7f54395 (diff) | |
| parent | 93e82ae781e1ca4797cf2a226d3c303975bd99c7 (diff) | |
Merge branch 'fix/hda' into for-linus
* fix/hda:
ALSA: hda - Set function_id only on FG nodes
ALSA: hda - Add upper-limit of mixer amp for AD1884A-laptop model, too
ALSA: hda - Fix headphone-detection on some machines with STAC/IDT codecs
ALSA: hda_intel.c - Consolidate bitfields
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 38ad3f7b040..9bcd8ab5a27 100644 --- a/sound/pci/hda/patch_analog.c +++ b/sound/pci/hda/patch_analog.c | |||
| @@ -3977,6 +3977,14 @@ static int patch_ad1884a(struct hda_codec *codec) | |||
| 3977 | spec->input_mux = &ad1884a_laptop_capture_source; | 3977 | spec->input_mux = &ad1884a_laptop_capture_source; |
| 3978 | codec->patch_ops.unsol_event = ad1884a_hp_unsol_event; | 3978 | codec->patch_ops.unsol_event = ad1884a_hp_unsol_event; |
| 3979 | codec->patch_ops.init = ad1884a_hp_init; | 3979 | codec->patch_ops.init = ad1884a_hp_init; |
| 3980 | /* set the upper-limit for mixer amp to 0dB for avoiding the | ||
| 3981 | * possible damage by overloading | ||
| 3982 | */ | ||
| 3983 | snd_hda_override_amp_caps(codec, 0x20, HDA_INPUT, | ||
| 3984 | (0x17 << AC_AMPCAP_OFFSET_SHIFT) | | ||
| 3985 | (0x17 << AC_AMPCAP_NUM_STEPS_SHIFT) | | ||
| 3986 | (0x05 << AC_AMPCAP_STEP_SIZE_SHIFT) | | ||
| 3987 | (1 << AC_AMPCAP_MUTE_SHIFT)); | ||
| 3980 | break; | 3988 | break; |
| 3981 | case AD1884A_MOBILE: | 3989 | case AD1884A_MOBILE: |
| 3982 | spec->mixers[0] = ad1884a_mobile_mixers; | 3990 | spec->mixers[0] = ad1884a_mobile_mixers; |