diff options
| author | Clemens Ladisch <clemens@ladisch.de> | 2010-10-04 13:21:52 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-10-05 18:11:17 +0200 |
| commit | b6ca8ab399d913eed0d89d65d6b768337a3d20d7 (patch) | |
| tree | 8167dd43f99c4f451cd73853da777d39812cb747 /sound/pci/oxygen/oxygen.c | |
| parent | 45bc307f328c044e69cad2a18a9ae972bb15f254 (diff) | |
| download | linux-3.10-b6ca8ab399d913eed0d89d65d6b768337a3d20d7.tar.gz linux-3.10-b6ca8ab399d913eed0d89d65d6b768337a3d20d7.tar.bz2 linux-3.10-b6ca8ab399d913eed0d89d65d6b768337a3d20d7.zip | |
ALSA: oxygen: handle CD input configuration with a flag
There are more models without a CD input than with one, so handle this
explicitly with a device_config flag to avoid having to define a control
filter callback to filter it out.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/oxygen/oxygen.c')
| -rw-r--r-- | sound/pci/oxygen/oxygen.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/oxygen/oxygen.c b/sound/pci/oxygen/oxygen.c index 289cb4dacfc..f4fdf6dac80 100644 --- a/sound/pci/oxygen/oxygen.c +++ b/sound/pci/oxygen/oxygen.c @@ -505,7 +505,8 @@ static const struct oxygen_model model_generic = { PLAYBACK_2_TO_AC97_1 | CAPTURE_0_FROM_I2S_1 | CAPTURE_1_FROM_SPDIF | - CAPTURE_2_FROM_AC97_1, + CAPTURE_2_FROM_AC97_1 | + AC97_CD_INPUT, .dac_channels = 8, .dac_volume_min = 0, .dac_volume_max = 255, |