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/xonar_pcm179x.c | |
parent | 45bc307f328c044e69cad2a18a9ae972bb15f254 (diff) | |
download | op-kernel-dev-b6ca8ab399d913eed0d89d65d6b768337a3d20d7.zip op-kernel-dev-b6ca8ab399d913eed0d89d65d6b768337a3d20d7.tar.gz |
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/xonar_pcm179x.c')
-rw-r--r-- | sound/pci/oxygen/xonar_pcm179x.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/sound/pci/oxygen/xonar_pcm179x.c b/sound/pci/oxygen/xonar_pcm179x.c index ba18fb5..338f885 100644 --- a/sound/pci/oxygen/xonar_pcm179x.c +++ b/sound/pci/oxygen/xonar_pcm179x.c @@ -915,13 +915,6 @@ static int xonar_d2_control_filter(struct snd_kcontrol_new *template) return 0; } -static int xonar_st_control_filter(struct snd_kcontrol_new *template) -{ - if (!strncmp(template->name, "CD Capture ", 11)) - return 1; /* no CD input */ - return 0; -} - static int add_pcm1796_controls(struct oxygen *chip) { int err; @@ -991,7 +984,8 @@ static const struct oxygen_model model_xonar_d2 = { CAPTURE_0_FROM_I2S_2 | CAPTURE_1_FROM_SPDIF | MIDI_OUTPUT | - MIDI_INPUT, + MIDI_INPUT | + AC97_CD_INPUT, .dac_channels = 8, .dac_volume_min = 255 - 2*60, .dac_volume_max = 255, @@ -1037,7 +1031,6 @@ static const struct oxygen_model model_xonar_st = { .longname = "Asus Virtuoso 100", .chip = "AV200", .init = xonar_st_init, - .control_filter = xonar_st_control_filter, .mixer_init = xonar_st_mixer_init, .cleanup = xonar_st_cleanup, .suspend = xonar_st_suspend, |