lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[ALSA] oxygen: remove MIDI for generic cards

Browse Source 
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>
This commit is contained in:
Clemens Ladisch
2008-01-24 08:43:39 +01:00
committed by Jaroslav Kysela
parent 33c646e4ff
commit cd93dc8cca
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sound/pci/oxygen/oxygen.c
View File

@@ -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,
++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;