leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Cards without S/PDIF output do not need those controls.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Clemens Ladisch 2015-01-16 22:14:18 +01:00 committed by Takashi Iwai
parent 70462457ff
commit 20eb26a2ec
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sound/pci/oxygen/oxygen_mixer.c
View File

@ -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)
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));