]> err.no Git - linux-2.6/commitdiff
[ALSA] oxygen: remove MIDI for generic cards
authorClemens Ladisch <clemens@ladisch.de>
Thu, 24 Jan 2008 07:43:39 +0000 (08:43 +0100)
committerJaroslav Kysela <perex@perex.cz>
Thu, 31 Jan 2008 16:30:13 +0000 (17:30 +0100)
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>
sound/pci/oxygen/oxygen.c

index af6e8026cb17a1ed6da02fcb88740d03d174e212..4f809bdc75e12d3aa63f4d3c222b9764f0b10609 100644 (file)
@@ -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;