aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-06-26 08:49:58 -0400
committerJaroslav Kysela <perex@perex.cz>2008-06-27 02:51:21 -0400
commit031005f78c8d0aebc17ddf7a34af9ffd48034d7d (patch)
treec1cf93a32ba54e99f3058f7fbf1464fcb6f9dd4d /sound
parent4a3b6983232cd296ea260e06461d031f10065d63 (diff)
ALSA: hda - disable amp override on non-HP machines
Some machines with Cx5045 seem to have no problem with the volume over 0dB on NID 0x17. Disable amp overrides for other devices but HP. Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/patch_conexant.c22
1 files changed, 13 insertions, 9 deletions
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
index e3df8ac37076..64df8100593d 100644
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@ -1005,15 +1005,19 @@ static int patch_cxt5045(struct hda_codec *codec)
1005#endif 1005#endif
1006 } 1006 }
1007 1007
1008 /* 1008 switch (codec->subsystem_id >> 16) {
1009 * Fix max PCM level to 0 dB 1009 case 0x103c:
1010 * (originall it has 0x2b steps with 0dB offset 0x14) 1010 /* HP laptop has a really bad sound over 0dB on NID 0x17.
1011 */ 1011 * Fix max PCM level to 0 dB
1012 snd_hda_override_amp_caps(codec, 0x17, HDA_INPUT, 1012 * (originall it has 0x2b steps with 0dB offset 0x14)
1013 (0x14 << AC_AMPCAP_OFFSET_SHIFT) | 1013 */
1014 (0x14 << AC_AMPCAP_NUM_STEPS_SHIFT) | 1014 snd_hda_override_amp_caps(codec, 0x17, HDA_INPUT,
1015 (0x05 << AC_AMPCAP_STEP_SIZE_SHIFT) | 1015 (0x14 << AC_AMPCAP_OFFSET_SHIFT) |
1016 (1 << AC_AMPCAP_MUTE_SHIFT)); 1016 (0x14 << AC_AMPCAP_NUM_STEPS_SHIFT) |
1017 (0x05 << AC_AMPCAP_STEP_SIZE_SHIFT) |
1018 (1 << AC_AMPCAP_MUTE_SHIFT));
1019 break;
1020 }
1017 1021
1018 return 0; 1022 return 0;
1019} 1023}