diff options
| author | Clemens Ladisch <clemens@ladisch.de> | 2015-01-16 22:14:18 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-01-16 22:43:50 +0100 |
| commit | 20eb26a2ec8d28f6106d210ea6a12f360e57a72b (patch) | |
| tree | d1d52abded3ac3621fa347f0772a400283eb14b9 /sound | |
| parent | 70462457ff80c214d87135380d2dffe646867e71 (diff) | |
| download | lwn-20eb26a2ec8d28f6106d210ea6a12f360e57a72b.tar.gz lwn-20eb26a2ec8d28f6106d210ea6a12f360e57a72b.zip | |
ALSA: oxygen: do not create useless S/PDIF controls
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>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/oxygen/oxygen_mixer.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sound/pci/oxygen/oxygen_mixer.c b/sound/pci/oxygen/oxygen_mixer.c index 5988e044c519..2f698a9a5044 100644 --- a/sound/pci/oxygen/oxygen_mixer.c +++ b/sound/pci/oxygen/oxygen_mixer.c @@ -786,6 +786,9 @@ static const struct snd_kcontrol_new controls[] = { .get = upmix_get, .put = upmix_put, }, +}; + +static const struct snd_kcontrol_new spdif_output_controls[] = { { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .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)); if (err < 0) 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) { err = add_controls(chip, spdif_input_controls, ARRAY_SIZE(spdif_input_controls)); |