diff options
| author | Mark Brown <broonie@kernel.org> | 2014-10-06 12:48:52 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-10-06 12:48:52 +0100 |
| commit | 64fdf13c8b5ff530f54dd767861f4e25a9ec2fe9 (patch) | |
| tree | 43d63a2217cb6d6d8a5105f341ccf6804b29fabf | |
| parent | 97c53e26f0773b9eb9ede21f544a91dd1bcd9ca9 (diff) | |
| parent | 5dc0158a27f65e7efaa6e3cc496d93b4c4c65d19 (diff) | |
| download | linux-64fdf13c8b5ff530f54dd767861f4e25a9ec2fe9.tar.bz2 | |
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
| -rw-r--r-- | include/sound/soc-dapm.h | 1 | ||||
| -rw-r--r-- | sound/soc/soc-dapm.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index d60c61b4b341..507d58ae09c1 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h @@ -432,6 +432,7 @@ int snd_soc_dapm_force_enable_pin_unlocked(struct snd_soc_dapm_context *dapm, int snd_soc_dapm_ignore_suspend(struct snd_soc_dapm_context *dapm, const char *pin); void snd_soc_dapm_auto_nc_pins(struct snd_soc_card *card); +unsigned int dapm_kcontrol_get_value(const struct snd_kcontrol *kcontrol); /* Mostly internal - should not normally be used */ void dapm_mark_io_dirty(struct snd_soc_dapm_context *dapm); diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 79f3b1eaf3b1..5c21cdeeeff1 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -326,12 +326,13 @@ static struct list_head *dapm_kcontrol_get_path_list( list_for_each_entry(path, dapm_kcontrol_get_path_list(kcontrol), \ list_kcontrol) -static unsigned int dapm_kcontrol_get_value(const struct snd_kcontrol *kcontrol) +unsigned int dapm_kcontrol_get_value(const struct snd_kcontrol *kcontrol) { struct dapm_kcontrol_data *data = snd_kcontrol_chip(kcontrol); return data->value; } +EXPORT_SYMBOL_GPL(dapm_kcontrol_get_value); static bool dapm_kcontrol_set_value(const struct snd_kcontrol *kcontrol, unsigned int value) |