summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2008-01-24 08:43:39 +0100
committerJaroslav Kysela <perex@perex.cz>2008-01-31 17:30:13 +0100
commitcd93dc8ccad8680f104c9134ae73888feb14e946 (patch)
treed7d5ab2a78f53e6a888b82bdfe6548d03cc268b2 /sound
parent33c646e4ffb1b48d67598fadf3323158f0cfd4b9 (diff)
downloadlinux-3.10-cd93dc8ccad8680f104c9134ae73888feb14e946.tar.gz
linux-3.10-cd93dc8ccad8680f104c9134ae73888feb14e946.tar.bz2
linux-3.10-cd93dc8ccad8680f104c9134ae73888feb14e946.zip
[ALSA] oxygen: remove MIDI for generic cards
None of the reference design models have MIDI, only the X-Meridian allows to connect a MIDI adapter. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/oxygen/oxygen.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/pci/oxygen/oxygen.c b/sound/pci/oxygen/oxygen.c
index af6e8026cb1..4f809bdc75e 100644
--- a/sound/pci/oxygen/oxygen.c
+++ b/sound/pci/oxygen/oxygen.c
@@ -386,7 +386,7 @@ static int __devinit generic_oxygen_probe(struct pci_dev *pci,
const struct pci_device_id *pci_id)
{
static int dev;
- const struct oxygen_model *model;
+ int is_meridian;
int err;
if (dev >= SNDRV_CARDS)
@@ -395,8 +395,9 @@ static int __devinit generic_oxygen_probe(struct pci_dev *pci,
++dev;
return -ENOENT;
}
- model = pci_id->driver_data ? &model_meridian : &model_generic;
- err = oxygen_pci_probe(pci, index[dev], id[dev], 1, model);
+ is_meridian = pci_id->driver_data;
+ err = oxygen_pci_probe(pci, index[dev], id[dev], is_meridian,
+ is_meridian ? &model_meridian : &model_generic);
if (err >= 0)
++dev;
return err;