Commit 20eb26a2 authored by Clemens Ladisch's avatar Clemens Ladisch Committed by Takashi Iwai

ALSA: oxygen: do not create useless S/PDIF controls

Cards without S/PDIF output do not need those controls.
Signed-off-by: default avatarClemens Ladisch <clemens@ladisch.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 70462457
...@@ -786,6 +786,9 @@ static const struct snd_kcontrol_new controls[] = { ...@@ -786,6 +786,9 @@ static const struct snd_kcontrol_new controls[] = {
.get = upmix_get, .get = upmix_get,
.put = upmix_put, .put = upmix_put,
}, },
};
static const struct snd_kcontrol_new spdif_output_controls[] = {
{ {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = SNDRV_CTL_NAME_IEC958("", PLAYBACK, SWITCH), .name = SNDRV_CTL_NAME_IEC958("", PLAYBACK, SWITCH),
...@@ -1073,6 +1076,12 @@ int oxygen_mixer_init(struct oxygen *chip) ...@@ -1073,6 +1076,12 @@ int oxygen_mixer_init(struct oxygen *chip)
err = add_controls(chip, controls, ARRAY_SIZE(controls)); err = add_controls(chip, controls, ARRAY_SIZE(controls));
if (err < 0) if (err < 0)
return err; return err;
if (chip->model.device_config & PLAYBACK_1_TO_SPDIF) {
err = add_controls(chip, spdif_output_controls,
ARRAY_SIZE(spdif_output_controls));
if (err < 0)
return err;
}
if (chip->model.device_config & CAPTURE_1_FROM_SPDIF) { if (chip->model.device_config & CAPTURE_1_FROM_SPDIF) {
err = add_controls(chip, spdif_input_controls, err = add_controls(chip, spdif_input_controls,
ARRAY_SIZE(spdif_input_controls)); ARRAY_SIZE(spdif_input_controls));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment