aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/patch_realtek.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-02-18 07:05:50 -0500
committerTakashi Iwai <tiwai@suse.de>2008-04-24 06:00:12 -0400
commit1c82ed1bc531746a8fa9b46c593ddce546f28026 (patch)
treebc86ba78100f31856cff9b596634d795d2793984 /sound/pci/hda/patch_realtek.c
parente922b0028fad87de0d262f9fa51f98595d2df258 (diff)
[ALSA] Keep private TLV entry in vmaster itself
Use a private array for TLV entries of virtual master controls instead of (supposed) static array. This cleans up the existing codes. Also, now vmaster assumes the simple dB-range TLV that is the only type it can handle. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/patch_realtek.c')
-rw-r--r--sound/pci/hda/patch_realtek.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index eea18b3336d3..e8ce525d297b 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -272,7 +272,6 @@ struct alc_spec {
272 272
273 /* for virtual master */ 273 /* for virtual master */
274 hda_nid_t vmaster_nid; 274 hda_nid_t vmaster_nid;
275 u32 vmaster_tlv[4];
276#ifdef CONFIG_SND_HDA_POWER_SAVE 275#ifdef CONFIG_SND_HDA_POWER_SAVE
277 struct hda_loopback_check loopback; 276 struct hda_loopback_check loopback;
278#endif 277#endif
@@ -1534,10 +1533,11 @@ static int alc_build_controls(struct hda_codec *codec)
1534 1533
1535 /* if we have no master control, let's create it */ 1534 /* if we have no master control, let's create it */
1536 if (!snd_hda_find_mixer_ctl(codec, "Master Playback Volume")) { 1535 if (!snd_hda_find_mixer_ctl(codec, "Master Playback Volume")) {
1536 unsigned int vmaster_tlv[4];
1537 snd_hda_set_vmaster_tlv(codec, spec->vmaster_nid, 1537 snd_hda_set_vmaster_tlv(codec, spec->vmaster_nid,
1538 HDA_OUTPUT, spec->vmaster_tlv); 1538 HDA_OUTPUT, vmaster_tlv);
1539 err = snd_hda_add_vmaster(codec, "Master Playback Volume", 1539 err = snd_hda_add_vmaster(codec, "Master Playback Volume",
1540 spec->vmaster_tlv, alc_slave_vols); 1540 vmaster_tlv, alc_slave_vols);
1541 if (err < 0) 1541 if (err < 0)
1542 return err; 1542 return err;
1543 } 1543 }