diff options
| author |   Mark Brown <broonie@linaro.org> | 2014-03-12 23:03:57 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-12 23:03:57 +0000 |
| commit | c6c124225f9551d78a19c291a2e204618f7e1e92 (patch) | |
| tree | f4a174c72f787aa213a8533b58ffdf4185607735 | |
| parent | Merge tag 'asoc-v3.14-rc6' into asoc-linus (diff) | |
| parent | ASoC: spear: spdif_out: Fix mute control (diff) | |
| download | wireguard-linux-c6c124225f9551d78a19c291a2e204618f7e1e92.tar.xz wireguard-linux-c6c124225f9551d78a19c291a2e204618f7e1e92.zip | |
Merge remote-tracking branch 'asoc/fix/spear' into asoc-linus
Diffstat (limited to '')
| -rw-r--r-- | sound/soc/spear/spdif_out.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sound/soc/spear/spdif_out.c b/sound/soc/spear/spdif_out.c index fe99f461aff0..19cca043e6e4 100644 --- a/sound/soc/spear/spdif_out.c +++ b/sound/soc/spear/spdif_out.c @@ -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]) |