diff options
| author | Clemens Ladisch <clemens@ladisch.de> | 2009-09-28 13:15:49 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-09-28 13:54:00 +0400 |
| commit | 75919d7c057be888c7cd7b192fad02182260b04a (patch) | |
| tree | 12aa926b269175b2b7bb8cb0c7ebf4e33936e978 /sound/pci/oxygen/oxygen_mixer.c | |
| parent | 268304f4c4f0b8677d67400f04ad4e0271ec3742 (diff) | |
| download | linux-75919d7c057be888c7cd7b192fad02182260b04a.tar.xz | |
sound: oxygen: better defaults for upmixing control
On card models with two-channel outputs, the base driver can
automatically disable the upmixing control so that the model
drivers do not need to do this.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/oxygen/oxygen_mixer.c')
| -rw-r--r-- | sound/pci/oxygen/oxygen_mixer.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/pci/oxygen/oxygen_mixer.c b/sound/pci/oxygen/oxygen_mixer.c index 5401c547c4e3..e8e911a86c8e 100644 --- a/sound/pci/oxygen/oxygen_mixer.c +++ b/sound/pci/oxygen/oxygen_mixer.c @@ -954,6 +954,9 @@ static int add_controls(struct oxygen *chip, if (err == 1) continue; } + if (!strcmp(template.name, "Stereo Upmixing") && + chip->model.dac_channels == 2) + continue; if (!strcmp(template.name, "Master Playback Volume") && chip->model.dac_tlv) { template.tlv.p = chip->model.dac_tlv; |