diff options
author | Jaroslav Kysela <perex@suse.cz> | 2006-07-27 04:44:30 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-09-23 04:39:05 -0400 |
commit | bc6c531eb53de8a0ba355f76ce2bd28f58e46707 (patch) | |
tree | 78fadf8996e1183911f1e40003c0e938641955c9 /sound/pci | |
parent | b7c6b03405896bc181e1e2c9c06628c3b1681af5 (diff) |
[ALSA] HDA driver - do not set mute flag for dB scale (follow HDA specification)
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/pci')
-rw-r--r-- | sound/pci/hda/hda_codec.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 78ff4575699d..399860c36be9 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c | |||
@@ -856,13 +856,6 @@ int snd_hda_mixer_amp_tlv(struct snd_kcontrol *kcontrol, int op_flag, | |||
856 | val2 = (((caps & AC_AMPCAP_STEP_SIZE) >> AC_AMPCAP_STEP_SIZE_SHIFT) + 1) * 25; | 856 | val2 = (((caps & AC_AMPCAP_STEP_SIZE) >> AC_AMPCAP_STEP_SIZE_SHIFT) + 1) * 25; |
857 | val1 = -((caps & AC_AMPCAP_OFFSET) >> AC_AMPCAP_OFFSET_SHIFT); | 857 | val1 = -((caps & AC_AMPCAP_OFFSET) >> AC_AMPCAP_OFFSET_SHIFT); |
858 | val1 = ((int)val1) * ((int)val2); | 858 | val1 = ((int)val1) * ((int)val2); |
859 | if (caps & AC_AMPCAP_MUTE) | ||
860 | val2 |= 0x10000; | ||
861 | if ((val2 & 0x10000) == 0 && dir == HDA_OUTPUT) { | ||
862 | caps = query_amp_caps(codec, nid, HDA_INPUT); | ||
863 | if (caps & AC_AMPCAP_MUTE) | ||
864 | val2 |= 0x10000; | ||
865 | } | ||
866 | if (put_user(SNDRV_CTL_TLVT_DB_SCALE, _tlv)) | 859 | if (put_user(SNDRV_CTL_TLVT_DB_SCALE, _tlv)) |
867 | return -EFAULT; | 860 | return -EFAULT; |
868 | if (put_user(2 * sizeof(unsigned int), _tlv + 1)) | 861 | if (put_user(2 * sizeof(unsigned int), _tlv + 1)) |