redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

ASoC: dapm: Convert pin switches to use snd_soc_card 

Since the addition of the non-CODEC control adds card controls like the
DAPM pin switch have been broken as they are expecting the private data
for the control to be the CODEC but it's now the card. Fix that for the
pin switches, an audit of other drivers is required.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@ti.com>
hifive-unleashed-5.1
Mark Brown 2012-02-14 17:11:15 -08:00
parent 64e60f9f9e
commit 48a8c3943d
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sound/soc/soc-dapm.c
View File

@ -2657,15 +2657,15 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_info_pin_switch);
int snd_soc_dapm_get_pin_switch(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);
const char *pin = (const char *)kcontrol->private_value;
mutex_lock(&codec->mutex);
mutex_lock(&card->mutex);
ucontrol->value.integer.value[0] =
snd_soc_dapm_get_pin_status(&codec->dapm, pin);
snd_soc_dapm_get_pin_status(&card->dapm, pin);
mutex_unlock(&codec->mutex);
mutex_unlock(&card->mutex);
return 0;
}
@ -2680,19 +2680,19 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_get_pin_switch);
int snd_soc_dapm_put_pin_switch(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{
struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);
const char *pin = (const char *)kcontrol->private_value;
mutex_lock(&codec->mutex);
mutex_lock(&card->mutex);
if (ucontrol->value.integer.value[0])
snd_soc_dapm_enable_pin(&codec->dapm, pin);
snd_soc_dapm_enable_pin(&card->dapm, pin);
else
snd_soc_dapm_disable_pin(&codec->dapm, pin);
snd_soc_dapm_disable_pin(&card->dapm, pin);
snd_soc_dapm_sync(&codec->dapm);
snd_soc_dapm_sync(&card->dapm);
mutex_unlock(&codec->mutex);
mutex_unlock(&card->mutex);
return 0;
}