diff options
author | Clemens Ladisch <clemens@ladisch.de> | 2008-01-21 02:45:37 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2008-01-31 11:30:06 -0500 |
commit | 44fb7aae82b37f5bb66cb1423e2babb11d90969e (patch) | |
tree | 031a965cf320c285f811e5b3de17152984ee4abf /sound/pci/oxygen/oxygen.c | |
parent | db2396d4959340dbe2b617bde3beb2268f1e3658 (diff) |
[ALSA] oxygen: remove MIDI autodetection
The MIDI bit in the MISC register is set by default and cannot be used
to detect the presence of a MIDI port. Instead, add a parameter to the
oxygen_pci_probe() function so that model drivers can specify this.
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/pci/oxygen/oxygen.c')
-rw-r--r-- | sound/pci/oxygen/oxygen.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/oxygen/oxygen.c b/sound/pci/oxygen/oxygen.c index e0e54ab51e5c..b11341f01c1d 100644 --- a/sound/pci/oxygen/oxygen.c +++ b/sound/pci/oxygen/oxygen.c | |||
@@ -327,7 +327,7 @@ static int __devinit generic_oxygen_probe(struct pci_dev *pci, | |||
327 | return -ENOENT; | 327 | return -ENOENT; |
328 | } | 328 | } |
329 | model = pci_id->driver_data ? &model_meridian : &model_generic; | 329 | model = pci_id->driver_data ? &model_meridian : &model_generic; |
330 | err = oxygen_pci_probe(pci, index[dev], id[dev], model); | 330 | err = oxygen_pci_probe(pci, index[dev], id[dev], 1, model); |
331 | if (err >= 0) | 331 | if (err >= 0) |
332 | ++dev; | 332 | ++dev; |
333 | return err; | 333 | return err; |