From 44fb7aae82b37f5bb66cb1423e2babb11d90969e Mon Sep 17 00:00:00 2001 From: Clemens Ladisch Date: Mon, 21 Jan 2008 08:45:37 +0100 Subject: [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 Signed-off-by: Jaroslav Kysela --- sound/pci/oxygen/oxygen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sound/pci/oxygen/oxygen.c') 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, return -ENOENT; } model = pci_id->driver_data ? &model_meridian : &model_generic; - err = oxygen_pci_probe(pci, index[dev], id[dev], model); + err = oxygen_pci_probe(pci, index[dev], id[dev], 1, model); if (err >= 0) ++dev; return err; -- cgit v1.2.3