diff options
author | Clemens Ladisch <clemens@ladisch.de> | 2008-01-24 02:43:39 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2008-01-31 11:30:13 -0500 |
commit | cd93dc8ccad8680f104c9134ae73888feb14e946 (patch) | |
tree | d7d5ab2a78f53e6a888b82bdfe6548d03cc268b2 /sound | |
parent | 33c646e4ffb1b48d67598fadf3323158f0cfd4b9 (diff) |
[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.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/pci/oxygen/oxygen.c b/sound/pci/oxygen/oxygen.c index af6e8026cb17..4f809bdc75e1 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, | |||
386 | const struct pci_device_id *pci_id) | 386 | const struct pci_device_id *pci_id) |
387 | { | 387 | { |
388 | static int dev; | 388 | static int dev; |
389 | const struct oxygen_model *model; | 389 | int is_meridian; |
390 | int err; | 390 | int err; |
391 | 391 | ||
392 | if (dev >= SNDRV_CARDS) | 392 | if (dev >= SNDRV_CARDS) |
@@ -395,8 +395,9 @@ static int __devinit generic_oxygen_probe(struct pci_dev *pci, | |||
395 | ++dev; | 395 | ++dev; |
396 | return -ENOENT; | 396 | return -ENOENT; |
397 | } | 397 | } |
398 | model = pci_id->driver_data ? &model_meridian : &model_generic; | 398 | is_meridian = pci_id->driver_data; |
399 | err = oxygen_pci_probe(pci, index[dev], id[dev], 1, model); | 399 | err = oxygen_pci_probe(pci, index[dev], id[dev], is_meridian, |
400 | is_meridian ? &model_meridian : &model_generic); | ||
400 | if (err >= 0) | 401 | if (err >= 0) |
401 | ++dev; | 402 | ++dev; |
402 | return err; | 403 | return err; |