summaryrefslogtreecommitdiffstats
path: root/sound/pci/oxygen/xonar_wm87x6.c
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2010-10-04 13:21:52 +0200
committerTakashi Iwai <tiwai@suse.de>2010-10-05 18:11:17 +0200
commitb6ca8ab399d913eed0d89d65d6b768337a3d20d7 (patch)
tree8167dd43f99c4f451cd73853da777d39812cb747 /sound/pci/oxygen/xonar_wm87x6.c
parent45bc307f328c044e69cad2a18a9ae972bb15f254 (diff)
downloadop-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_wm87x6.c')
-rw-r--r--sound/pci/oxygen/xonar_wm87x6.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/sound/pci/oxygen/xonar_wm87x6.c b/sound/pci/oxygen/xonar_wm87x6.c
index 5f9f59c..200f760 100644
--- a/sound/pci/oxygen/xonar_wm87x6.c
+++ b/sound/pci/oxygen/xonar_wm87x6.c
@@ -1028,13 +1028,6 @@ static const struct snd_kcontrol_new lc_controls[] = {
LC_CONTROL_ALC, wm8776_ngth_db_scale),
};
-static int xonar_ds_control_filter(struct snd_kcontrol_new *template)
-{
- if (!strncmp(template->name, "CD Capture ", 11))
- return 1; /* no CD input */
- return 0;
-}
-
static int xonar_ds_mixer_init(struct oxygen *chip)
{
struct xonar_wm87x6 *data = chip->model_data;
@@ -1074,7 +1067,6 @@ static const struct oxygen_model model_xonar_ds = {
.longname = "Asus Virtuoso 66",
.chip = "AV200",
.init = xonar_ds_init,
- .control_filter = xonar_ds_control_filter,
.mixer_init = xonar_ds_mixer_init,
.cleanup = xonar_ds_cleanup,
.suspend = xonar_ds_suspend,
OpenPOWER on IntegriCloud