aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/oxygen/oxygen.c
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2008-03-19 03:20:59 -0400
committerTakashi Iwai <tiwai@suse.de>2008-04-24 06:00:28 -0400
commitdb12b8e301455cf18644aa3b765ae10869eb947c (patch)
treea572f2ed562624cb06431b82a3ee4a19725763ad /sound/pci/oxygen/oxygen.c
parent87eedd2fd409d5cd515ccd6fc454cef15c5fa38b (diff)
[ALSA] oxygen: move MIDI flag to model struct
Put the flag that enables the MIDI port into the model structure instead of passing it as a separate parameter to oxygen_pci_probe(). Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/oxygen/oxygen.c')
-rw-r--r--sound/pci/oxygen/oxygen.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/oxygen/oxygen.c b/sound/pci/oxygen/oxygen.c
index e9031ede9621..511ef34a43ca 100644
--- a/sound/pci/oxygen/oxygen.c
+++ b/sound/pci/oxygen/oxygen.c
@@ -336,6 +336,7 @@ static const struct oxygen_model model_meridian = {
336 CAPTURE_1_FROM_SPDIF | 336 CAPTURE_1_FROM_SPDIF |
337 CAPTURE_2_FROM_AC97_1, 337 CAPTURE_2_FROM_AC97_1,
338 .dac_channels = 8, 338 .dac_channels = 8,
339 .misc_flags = OXYGEN_MISC_MIDI,
339 .function_flags = OXYGEN_FUNCTION_SPI | 340 .function_flags = OXYGEN_FUNCTION_SPI |
340 OXYGEN_FUNCTION_ENABLE_SPI_4_5, 341 OXYGEN_FUNCTION_ENABLE_SPI_4_5,
341 .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST, 342 .dac_i2s_format = OXYGEN_I2S_FORMAT_LJUST,
@@ -356,7 +357,7 @@ static int __devinit generic_oxygen_probe(struct pci_dev *pci,
356 return -ENOENT; 357 return -ENOENT;
357 } 358 }
358 is_meridian = pci_id->driver_data; 359 is_meridian = pci_id->driver_data;
359 err = oxygen_pci_probe(pci, index[dev], id[dev], is_meridian, 360 err = oxygen_pci_probe(pci, index[dev], id[dev],
360 is_meridian ? &model_meridian : &model_generic); 361 is_meridian ? &model_meridian : &model_generic);
361 if (err >= 0) 362 if (err >= 0)
362 ++dev; 363 ++dev;