diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-08-14 11:39:57 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-08-14 11:39:57 +0200 |
| commit | 61074c1a2d798be90e149a9ed4ce0e3596c00a38 (patch) | |
| tree | 90056774f471f28fe155c70c05743d751bb28466 /sound | |
| parent | ALSA: hda/ca0132 - Don't try loading firmware at resume when already failed (diff) | |
| download | linux-61074c1a2d798be90e149a9ed4ce0e3596c00a38.tar.xz linux-61074c1a2d798be90e149a9ed4ce0e3596c00a38.zip | |
ALSA: hda - Set TLV_DB_SCALE_MUTE bit for cx5051 vmaster
Conexnat HD-audio driver has a workaround for cx5051 (aka CX20561)
chip to add fake mute controls to each amp (commit 3868137e). This
implies the minimum-as-mute TLV bit in TLV for each corresponding
control. Meanwhile we build the virtual master from these, but the
TLV bit is missing, even though the slaves have it.
This patch simply adds the missing TLV_DB_SCALE_MUTE bit for vmaster,
as already done in patch_sigmatel.c.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/hda/patch_conexant.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index 7627a69ca6d7..6f2fa838b635 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c @@ -26,6 +26,7 @@ #include <linux/module.h> #include <sound/core.h> #include <sound/jack.h> +#include <sound/tlv.h> #include "hda_codec.h" #include "hda_local.h" @@ -859,6 +860,11 @@ static int patch_conexant_auto(struct hda_codec *codec) if (err < 0) goto error; + if (codec->vendor_id == 0x14f15051) { + /* minimum value is actually mute */ + spec->gen.vmaster_tlv[3] |= TLV_DB_SCALE_MUTE; + } + codec->patch_ops = cx_auto_patch_ops; /* Some laptops with Conexant chips show stalls in S3 resume, |