Commit cd93dc8c authored by Clemens Ladisch's avatar Clemens Ladisch Committed by Jaroslav Kysela

[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: default avatarClemens Ladisch <clemens@ladisch.de>
Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
parent 33c646e4
...@@ -386,7 +386,7 @@ static int __devinit generic_oxygen_probe(struct pci_dev *pci, ...@@ -386,7 +386,7 @@ static int __devinit generic_oxygen_probe(struct pci_dev *pci,
const struct pci_device_id *pci_id) const struct pci_device_id *pci_id)
{ {
static int dev; static int dev;
const struct oxygen_model *model; int is_meridian;
int err; int err;
if (dev >= SNDRV_CARDS) if (dev >= SNDRV_CARDS)
...@@ -395,8 +395,9 @@ static int __devinit generic_oxygen_probe(struct pci_dev *pci, ...@@ -395,8 +395,9 @@ static int __devinit generic_oxygen_probe(struct pci_dev *pci,
++dev; ++dev;
return -ENOENT; return -ENOENT;
} }
model = pci_id->driver_data ? &model_meridian : &model_generic; is_meridian = pci_id->driver_data;
err = oxygen_pci_probe(pci, index[dev], id[dev], 1, model); err = oxygen_pci_probe(pci, index[dev], id[dev], is_meridian,
is_meridian ? &model_meridian : &model_generic);
if (err >= 0) if (err >= 0)
++dev; ++dev;
return err; return err;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment