aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/hda_local.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-03-12 12:25:03 +0100
committerTakashi Iwai <tiwai@suse.de>2012-03-12 14:52:28 +0100
commit29e5853d618282d8277ce8a8304f7424eb60deb5 (patch)
treee6f2990534e3656f9bbdc1a13cb3fc3cf41934c9 /sound/pci/hda/hda_local.h
parent2ad787e9aae8bfac14fa96748c0f2b034577be6a (diff)
downloadkernel_goldelico_gta04-29e5853d618282d8277ce8a8304f7424eb60deb5.zip
kernel_goldelico_gta04-29e5853d618282d8277ce8a8304f7424eb60deb5.tar.gz
kernel_goldelico_gta04-29e5853d618282d8277ce8a8304f7424eb60deb5.tar.bz2
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 caa6468..c3ee4ed 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,
struct snd_kcontrol *snd_hda_find_mixer_ctl(struct hda_codec *codec,
const char *name);
int __snd_hda_add_vmaster(struct hda_codec *codec, char *name,
- unsigned int *tlv, const char * const *slaves,
- const char *suffix, bool init_slave_vol);
+ unsigned int *tlv, const char * const *slaves,
+ const char *suffix, bool init_slave_vol,
+ struct snd_kcontrol **ctl_ret);
#define snd_hda_add_vmaster(codec, name, tlv, slaves, suffix) \
- __snd_hda_add_vmaster(codec, name, tlv, slaves, suffix, true)
+ __snd_hda_add_vmaster(codec, name, tlv, slaves, suffix, true, NULL)
int snd_hda_codec_reset(struct hda_codec *codec);
/* amp value bits */