From: Clemens Ladisch Date: Thu, 24 Jan 2008 07:43:39 +0000 (+0100) Subject: [ALSA] oxygen: remove MIDI for generic cards X-Git-Tag: v2.6.25-rc1~1127^2~47 X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=cd93dc8ccad8680f104c9134ae73888feb14e946;p=linux-2.6-omap-h63xx.git [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 Signed-off-by: Jaroslav Kysela --- 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;