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

Commit db68b68d authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/fix/spear' into asoc-linus

parents c08e0d3b bde24030

sound/soc/spear/spdif_out.c

+2 −8
Original line number Diff line number Diff line
@@ -213,10 +213,7 @@ static int spdif_digital_mute(struct snd_soc_dai *dai, int mute) 
static int spdif_mute_get(struct snd_kcontrol *kcontrol,

		struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);

	struct snd_soc_card *card = codec->card;

	struct snd_soc_pcm_runtime *rtd = card->rtd;

	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;

	struct snd_soc_dai *cpu_dai = snd_kcontrol_chip(kcontrol);

	struct spdif_out_dev *host = snd_soc_dai_get_drvdata(cpu_dai);



	ucontrol->value.integer.value[0] = host->saved_params.mute;
@@ -226,10 +223,7 @@ static int spdif_mute_get(struct snd_kcontrol *kcontrol, 
static int spdif_mute_put(struct snd_kcontrol *kcontrol,

		struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);

	struct snd_soc_card *card = codec->card;

	struct snd_soc_pcm_runtime *rtd = card->rtd;

	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;

	struct snd_soc_dai *cpu_dai = snd_kcontrol_chip(kcontrol);

	struct spdif_out_dev *host = snd_soc_dai_get_drvdata(cpu_dai);



	if (host->saved_params.mute == ucontrol->value.integer.value[0])