aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/hda_local.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-03-12 07:25:03 -0400
committerTakashi Iwai <tiwai@suse.de>2012-03-12 09:52:28 -0400
commit29e5853d618282d8277ce8a8304f7424eb60deb5 (patch)
treee6f2990534e3656f9bbdc1a13cb3fc3cf41934c9 /sound/pci/hda/hda_local.h
parent2ad787e9aae8bfac14fa96748c0f2b034577be6a (diff)
ALSA: hda - Return the created kcontrol in __snd_hda_add_vmaster()
It'll be used for adding hooks in later patches. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_local.h')
-rw-r--r--sound/pci/hda/hda_local.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h
index caa64686267b..c3ee4ede4482 100644
--- a/sound/pci/hda/hda_local.h
+++ b/sound/pci/hda/hda_local.h
@@ -140,10 +140,11 @@ void snd_hda_set_vmaster_tlv(struct hda_codec *codec, hda_nid_t nid, int dir,
140struct snd_kcontrol *snd_hda_find_mixer_ctl(struct hda_codec *codec, 140struct snd_kcontrol *snd_hda_find_mixer_ctl(struct hda_codec *codec,
141 const char *name); 141 const char *name);
142int __snd_hda_add_vmaster(struct hda_codec *codec, char *name, 142int __snd_hda_add_vmaster(struct hda_codec *codec, char *name,
143 unsigned int *tlv, const char * const *slaves, 143 unsigned int *tlv, const char * const *slaves,
144 const char *suffix, bool init_slave_vol); 144 const char *suffix, bool init_slave_vol,
145 struct snd_kcontrol **ctl_ret);
145#define snd_hda_add_vmaster(codec, name, tlv, slaves, suffix) \ 146#define snd_hda_add_vmaster(codec, name, tlv, slaves, suffix) \
146 __snd_hda_add_vmaster(codec, name, tlv, slaves, suffix, true) 147 __snd_hda_add_vmaster(codec, name, tlv, slaves, suffix, true, NULL)
147int snd_hda_codec_reset(struct hda_codec *codec); 148int snd_hda_codec_reset(struct hda_codec *codec);
148 149
149/* amp value bits */ 150/* amp value bits */