Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48a8c394 authored by Mark Brown's avatar Mark Brown
Browse files

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: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarLiam Girdwood <lrg@ti.com>
parent 64e60f9f

sound/soc/soc-dapm.c

+10 −10
Original line number Diff line number Diff line
@@ -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;

}