Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=cd93dc8ccad8680f104c9134ae73888feb14e946
Commit: cd93dc8ccad8680f104c9134ae73888feb14e946
Parent: 33c646e4ffb1b48d67598fadf3323158f0cfd4b9
Author: Clemens Ladisch <[EMAIL PROTECTED]>
AuthorDate: Thu Jan 24 08:43:39 2008 +0100
Committer: Jaroslav Kysela <[EMAIL PROTECTED]>
CommitDate: Thu Jan 31 17:30:13 2008 +0100
[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 <[EMAIL PROTECTED]>
Signed-off-by: Jaroslav Kysela <[EMAIL PROTECTED]>
---
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 af6e802..4f809bd 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;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
