diff options
author | Matthew Ranostay <mranostay@embeddedalley.com> | 2008-09-25 09:17:11 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2008-10-10 07:41:33 -0400 |
commit | ddc0f38a62083a552d6acb792d9ce513cf4081df (patch) | |
tree | 74f2dac682df10714a06e88698c30b32efa89f78 /sound/pci/hda | |
parent | 37c34ffb3a9a6051236a4ee1acb7752bcc3f50fd (diff) |
ALSA: hda: slave_dig_outs code block in wrong location
Removed invalid references to slave_dig_outs inside the S/PDIF IN capture switch
control. Beforehand this was basically a mute switch for the S/PDIF outs as well.
Signed-off-by: Matthew Ranostay <mranostay@embeddedalley.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/pci/hda')
-rw-r--r-- | sound/pci/hda/hda_codec.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index c742e101d91e..cb9aae5e9ca5 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c | |||
@@ -1652,15 +1652,9 @@ static int snd_hda_spdif_in_switch_put(struct snd_kcontrol *kcontrol, | |||
1652 | mutex_lock(&codec->spdif_mutex); | 1652 | mutex_lock(&codec->spdif_mutex); |
1653 | change = codec->spdif_in_enable != val; | 1653 | change = codec->spdif_in_enable != val; |
1654 | if (change) { | 1654 | if (change) { |
1655 | hda_nid_t *d; | ||
1656 | codec->spdif_in_enable = val; | 1655 | codec->spdif_in_enable = val; |
1657 | snd_hda_codec_write_cache(codec, nid, 0, | 1656 | snd_hda_codec_write_cache(codec, nid, 0, |
1658 | AC_VERB_SET_DIGI_CONVERT_1, val); | 1657 | AC_VERB_SET_DIGI_CONVERT_1, val); |
1659 | |||
1660 | if (codec->slave_dig_outs) | ||
1661 | for (d = codec->slave_dig_outs; *d; d++) | ||
1662 | snd_hda_codec_write_cache(codec, *d, 0, | ||
1663 | AC_VERB_SET_DIGI_CONVERT_1, val); | ||
1664 | } | 1658 | } |
1665 | mutex_unlock(&codec->spdif_mutex); | 1659 | mutex_unlock(&codec->spdif_mutex); |
1666 | return change; | 1660 | return change; |